Commit Graph

20886 Commits

Author SHA1 Message Date
Tom Klein
c8ba465303 Bug 1117833 - Cancel pending visit and save immediately when title is updated. r=snorp
MozReview-Commit-ID: 3eSyovpfO3A

--HG--
extra : rebase_source : 7c71f099f8a138de9a9bedf2fc57d84209bee434
2016-06-30 23:39:29 -05:00
Tom Klein
693ac9734a Bug 1264347 - Refactor SnackbarHelper to use builder pattern. r=sebastian
MozReview-Commit-ID: 9WZBhhJIdNq

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/SnackbarHelper.java => mobile/android/base/java/org/mozilla/gecko/SnackbarBuilder.java
extra : rebase_source : f5bccb838b015fcb40709ab71a5ab8d42a75153e
2016-07-11 09:42:01 -05:00
Andrzej Hunt
069a4f4f33 Bug 1284587 - Distinguish normal from reader view bookmarks in telemetry r=liuche
We want to be able to detect when we've opened a reader view item. Note: this is
independent of whether or not we're in the Reading List smartfolder: it's possible
to open reader view bookmarks from any real bookmark folder, or the smartfolder.

MozReview-Commit-ID: KhqclodWSji

--HG--
extra : amend_source : 96460a430de900920dc2858dc171544657771abb
2016-07-05 15:29:55 -07:00
Jan Henning
67ad36aff0 Bug 1253654 - Part 2 - Don't show the item divider in the history panel after a section header. r=liuche
That way, the section headers (e.g. "Today", "Yesterday", "Last 7 days" etc.) blend better with the following item.

The correct hiding of the divider depends on the view type reported for the respective RecylerView child items. Because the view type is stored a simple number, this means that any other RecylerView wanting to use this divider decoration implementation must use the same item types as the history panel in order to remain compatible, otherwise the divider could be unexpectedly hidden. Therefore, we rename the DividerItemDecoration to underline its intended usage scope.

MozReview-Commit-ID: 8JUS6ke3RBL

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/widget/DividerItemDecoration.java => mobile/android/base/java/org/mozilla/gecko/widget/HistoryDividerItemDecoration.java
extra : transplant_source : %E8%B7%8E%9F%C9%E5%CCmX%22r%D7%D2%8A%DF%2A%D0%83%9Bw
2016-07-14 20:57:43 +02:00
Jan Henning
1f9969116c Bug 1253654 - Part 1 - Update home panels section header styling. r=liuche
MozReview-Commit-ID: EflkRCg0Xby

--HG--
extra : transplant_source : %F3%BEm%AD%91%26/m%5E7%90%0F%01%C9%82_HZIU
2016-07-09 15:38:23 +02:00
Carsten "Tomcat" Book
a61e84c9f3 merge fx-team to mozilla-central a=merge 2016-07-17 09:16:38 +02:00
Kris Maglione
63c5aef93a Bug 1272222: Use larger icons for browser actions in the menu panel. r=Gijs
MozReview-Commit-ID: 26lmlcrngPk

--HG--
extra : rebase_source : b9d6bfb7669d3cb826ccaa6728e153ad3e3b2b8b
2016-07-13 15:16:00 -07:00
Sebastian Kaspari
e753074c83 Bug 1285926 - Post: Remove trailing whitespace from string. r=flod
MozReview-Commit-ID: KuNXcoiAJV5

--HG--
extra : amend_source : 7c935772626f3d5d394d50de5a46749ed5b28af7
2016-07-14 14:50:12 +02:00
Carsten "Tomcat" Book
297c287adc Backed out changeset 576835bcf8e3 (bug 1285063) 2016-07-14 14:18:53 +02:00
Matthew Wein
0aa659b7d2 Bug 1285063 - Part 2 - Switch to using the Category Manager to register scripts/schemas in order to load them in time for Fennec. r=kmag
MozReview-Commit-ID: AviHoenUfwY

--HG--
extra : transplant_source : %DEB%ED%86D%ED6%85%D1%5E%9FhS%BAd%40/%D0f%B7
2016-07-11 15:30:50 -07:00
Nicholas Rosbrook
61858cc00e Bug 1261980 - Added checks in GeckoProfileDirectories to prevent null dereferencing. r=mcomella
--HG--
extra : rebase_source : 5c8d3734b688b9606bf9d593adea96bf25b7e6ee
2016-06-17 18:22:26 -07:00
Jan Henning
dd79a6bb8c Bug 1284017 - Add telemetry for damaged session store files. r=sebastian
Just watching for a SessionRestoreException during startup can introduce some false positives, because that exception is triggered in any case where we can't restore tabs, not just when the session file has been damaged, e.g.:
- on first startup
- on builds affected by bug 1228593, users who are (theoretically) restoring their tabs, but clearing their history on exist end up with a deleted sessionstore.js
- should we implement bug 1275662, we'd hit that exception in that case, too.

Therefore we only send the telemetry event if we hit that exception even though a sessionstore.js file is present. We also exclude the case where the file size of sessionstore.js is 14 bytes, because that is most likely corresponding to a file containing only {"windows":[]}, which means that the session store intentionally wanted to write a file containing no tabs.

Currently this is only the case for users who are clearing their history on exit and are also *not* restoring tabs, however if bug 1275662 should get implemented, we'd probably encounter those empty files for users who have their restore setting set to "Always restore", too.

Because of bug 1261008, we can also end up with no restored tabs (and a SessionRestoreException) if the session file contains only about:home tabs with no history, because we're skipping those and not restoring them. To detect that case and exclude it from telemetry, we have to include additional logic within the SessionParser instance used during startup and pass those results back to the calling site in GeckoApp.

MozReview-Commit-ID: 6pAhDU3d8QA

--HG--
extra : rebase_source : ebf4d902a616c17ba10c645ad8ef469ceafe8cce
2016-07-05 22:40:01 +02:00
Carsten "Tomcat" Book
42c9a619ec merge fx-team to mozilla-central a=merge 2016-07-14 11:44:21 +02:00
Wes Kocher
d01201c94e Merge m-c to fx-team, a=merge 2016-07-13 14:11:54 -07:00
Mike Taylor
4fd54506f8 Bug 1285211. Enable "Report Site Issue" menu item in Aurora + Nightly. r=sebastian 2016-07-13 12:32:54 -04:00
Carsten "Tomcat" Book
564f508e43 merge mozilla-inbound to mozilla-central a=merge 2016-07-13 17:27:34 +02:00
Carsten "Tomcat" Book
d50eba7171 merge fx-team to mozilla-central a=merge 2016-07-13 17:24:54 +02:00
Grigory Kruglov
782ab6a25d Backed out changeset 5e2a5623088f (bug 1278301) because this feature is pending further investigation r=ahunt
MozReview-Commit-ID: ErVAafkRkqh

--HG--
extra : rebase_source : 4be19a6b3561a9b194b0f117b1ddfb5bc1bb82d8
2016-07-11 09:17:24 -07:00
Thom Chiovoloni
838730ae1b Bug 1238128 - Ensure that the details passed to WebChannelMessageToChrome is a string, with a whitelist for messages from existing users r=Margaret,markh,MattN
MozReview-Commit-ID: DpdJ5bUcBdQ

--HG--
extra : rebase_source : b240484b44e9040b2d4e8509589f288e896a4267
2016-07-12 19:34:41 -04:00
Jonathan Almeida (:jonalmeida)
c3adc70e06 Bug 1283478 - Tapping the download notification does not open the downloaded file r=mcomella
We were incorrectly retrieving the cookie from the notification intent
and passing that along which affected the invocation of the notification.

MozReview-Commit-ID: FxL8sw6lByJ

--HG--
extra : rebase_source : 503ab15c58b9403851477b380ffe7ac3bd2f7215
extra : amend_source : 8dd88a72795184f825a1e43f0cb163691cf97181
2016-07-05 15:44:17 -07:00
Carsten "Tomcat" Book
9c84360118 Merge mozilla-central to fx-team 2016-07-13 17:28:49 +02:00
Sebastian Kaspari
19871f936c Bug 1285926 - Add preference for enabling/disabling custom tabs support. r=grisha
MozReview-Commit-ID: 8KmJo5IM7JS

--HG--
extra : rebase_source : 276e646d04b1060f5e0a2575408dac266d94f28d
2016-07-11 15:41:55 +02:00
Carsten "Tomcat" Book
a7e954de09 Merge mozilla-central to fx-team 2016-07-12 16:42:42 +02:00
Carsten "Tomcat" Book
010d84a620 merge mozilla-inbound to mozilla-central a=merge 2016-07-12 16:30:18 +02:00
Sebastian Kaspari
ab950918d5 Bug 1284372 - URL bar: Force LTR for the URL. r=grisha
MozReview-Commit-ID: 3WnPTRmk5VO

--HG--
extra : rebase_source : 883ef94e601c2251db40dc59895289c2af957d61
2016-07-06 13:57:19 +02:00
Carsten "Tomcat" Book
02ea56d596 merge mozilla-inbound to mozilla-central a=merge 2016-07-12 10:58:33 +02:00
Jim Chen
247c8dadf2 Bug 1285570 - Implement VISITED event as native method; r=snorp
Convert the VISITED event in GeckoEvent to a native method call in
GeckoAppShell.
2016-07-11 18:07:35 -04:00
Jim Chen
71a6e62f73 Bug 1283739 - Prevent reentrant calls to showSoftInput and hideSoftInput; r=esawin
Add a check to showSoftInput and hideSoftInput To prevent an infinite
recursive loop of showSoftInput indirectly calling
onCreateInputConnection, which calls showSoftInput again,
2016-07-11 18:07:35 -04:00
Jim Chen
77a100ac1c Bug 1280446 - Follow-up to fix another possible crash; r=me 2016-07-11 17:16:57 -04:00
Carsten "Tomcat" Book
c4f94c21a0 Merge mozilla-central to fx-team 2016-07-11 16:25:10 +02:00
Carsten "Tomcat" Book
bd92616152 merge mozilla-inbound to mozilla-central a=merge 2016-07-11 16:21:15 +02:00
Grigory Kruglov
172be55891 Bug 1245791 - Part 2: Use LocalBroadcastManager for account change broadcasts r=nalexander
MozReview-Commit-ID: 493TXqS29Xt

--HG--
extra : rebase_source : 57499bb32019f5e4268fd02785cc3641785215f6
2016-07-07 18:15:08 -07:00
Grigory Kruglov
a3e84b7d79 Bug 1245791 - Part 1: Start FxAccountDeletedService directly, not through an intent r=nalexander
MozReview-Commit-ID: Ll1YkUhrQTJ

--HG--
extra : rebase_source : f7be09abe5f3950043549cf44ac8d0c092fda9d3
2016-07-07 11:32:52 -07:00
Grigory Kruglov
1e81008e49 Bug 1245791 - Pre: Remove unnecessary AccountLoaderNative r=nalexander
MozReview-Commit-ID: J1kzldfRTjx

--HG--
extra : rebase_source : 7137cc6b2edd1dc642dd31f0ce67ba3d4d94c653
2016-07-07 18:15:23 -07:00
Grigory Kruglov
150370f940 Bug 1245795 - Split Stumbler BroadcastReceivers into Local, System and Safe r=nalexander
SafeReceiver is responsible for registering LocalReceiver with a LocalBroadcastManager.
SystemReceiver is responsible for handling BOOT_COMPLETE and EXTERNAL_APPLICATIONS_AVAILABLE intents.
LocalReceiver is responsible for handling passed in Stumbler preferences (enabled state, API key, user agent).

StumblerPreferences are now sent using LocalBroadcastManager, avoiding any possibility of leaking API key.

MozReview-Commit-ID: J8pRN6pbLOg

--HG--
rename : mobile/android/stumbler/java/org/mozilla/mozstumbler/service/mainthread/PassiveServiceReceiver.java => mobile/android/stumbler/java/org/mozilla/mozstumbler/service/mainthread/LocalPreferenceReceiver.java
extra : rebase_source : 0f11bb5aa38c27849f1a4f35ed51bdf259c418c8
2016-07-07 19:40:11 -07:00
Sebastian Kaspari
071a04afd9 Bug 1283881 - Read homepage from Android's "Partner Customizations" content provider if read_partner_customizations_provider is set. r=grisha
MozReview-Commit-ID: 8He4sv8MoUw

--HG--
extra : rebase_source : 24e06b07c67cfe46383954abe4cef1914524f950
2016-07-05 14:48:23 +02:00
Grigory Kruglov
af2a097cb4 Bug 1245795 - Pre: Purge OrderedBroadcast r=nalexander
MozReview-Commit-ID: Ad1ENG0XJX1

--HG--
extra : rebase_source : dea0a39f6340e84f1fabee5abf8b861b26c92b2e
2016-07-04 17:51:15 -07:00
Sebastian Kaspari
7544d420b6 Bug 1283881 - Add PartnerBrowserCustomizationsClient for reading customizations from Android's "partner browser customizations" content provider. r=grisha
MozReview-Commit-ID: 3qVXGHC6LfE

--HG--
extra : rebase_source : 29d545e4e6ac606558a4f4cdf3f8f474d0606af0
2016-07-04 16:14:36 +02:00
Shih-Chiang Chien
004be13dbc Bug 1272197 - Part 3, backward compatibility for connecting TV 2.5 devices. r=junior
MozReview-Commit-ID: 1znjwuoO27b

--HG--
rename : dom/presentation/provider/MulticastDNSDeviceProvider.cpp => dom/presentation/provider/LegacyMDNSDeviceProvider.cpp
rename : dom/presentation/provider/MulticastDNSDeviceProvider.h => dom/presentation/provider/LegacyMDNSDeviceProvider.h
2016-07-04 18:27:09 +08:00
Sebastian Kaspari
8c58d6891e Bug 1283025 - Add support for PartnerBookmarksProvider. r=grisha
If a distribution sets "distribution.read_partner_bookmarks_provider" (Android preference)
to 'true' then Fennec will read from Android's PartnerBookmarksProvider [1] and add them
to the bookmarks panel UI.

[1] https://android.googlesource.com/platform/packages/providers/PartnerBookmarksProvider/+/master/src/com/android/providers/partnerbookmarks/PartnerBookmarksProvider.java

MozReview-Commit-ID: Lr50X4HhoC8

--HG--
extra : rebase_source : dae3ab3b1808db09eb82785c43e11c4e00f8f117
2016-07-04 20:00:01 +02:00
Wes Kocher
bacab7c0f8 Merge m-c to autoland, a=merge 2016-07-12 16:54:34 -07:00
Wes Kocher
0dcab503c5 Merge m-c to inbound, a=merge CLOSED TREE 2016-07-12 17:16:47 -07:00
Justin Wood
27f34d80f1 Bug 1223385 - use in-tree compare-locales in Makefiles, r=gps
Also fix that the default merge dir in the mach command creates a directory
that's the merge make target, and thus keeps that make target from actually
running.

MozReview-Commit-ID: HWZBPxWuHSy

--HG--
extra : rebase_source : a39157ad9eb99f3eef5d149d003e62a235f92fc1
2016-07-08 11:59:27 -04:00
Yoshi Huang
e24cc195d9 Bug 1274893 - remove -forbid- list from SafeBrowsing. r=francois 2016-07-11 16:11:32 +08:00
Phil Ringnalda
bc94fc8653 Merge f-t to m-c, a=merge 2016-07-09 08:53:47 -07:00
Wes Kocher
f5f39f87cc Merge m-c to inbound, a=merge CLOSED TREE 2016-07-08 15:04:23 -07:00
Wes Kocher
2a800a6763 Merge fx-team to central, a=merge CLOSED TREE 2016-07-08 15:02:31 -07:00
Jim Chen
ff2fd08d62 Bug 1283882 - Implement LOCATION_EVENT as native call; r=snorp
Convert LOCATION_EVENT in GeckoEvent to a native method call in
GeckoAppShell.
2016-07-08 11:39:10 -04:00
Jim Chen
976590c3b2 Bug 1283882 - Move location listener to GeckoAppShell; r=snorp
Move LocationListener implementation from GeckoApp to GeckoAppShell
because the LocationListener consumer is in GeckoAppShell.
2016-07-08 11:39:09 -04:00
Jim Chen
e01ee0921d Bug 1283844 - Implement SENSOR_EVENT as native call; r=snorp
Remove SENSOR_EVENT from GeckoEvent and implement it as a native method
in GeckoAppShell that is invoked by the sensor event listener in
GeckoAppShell.
2016-07-08 11:39:09 -04:00
Jim Chen
2b7ff3f3e5 Bug 1283844 - Implement sensor event listener in GeckoAppShell; r=snorp
Implement SensorEventListener directly in GeckoAppShell instead of
indirectly through GeckoInterface and GeckoApp, because the
SensorEventListener consumer is in GeckoAppShell.
2016-07-08 11:39:09 -04:00
Nicholas Rosbrook
8e773e93eb Bug 1280794 - Updated WebURLFinder to use new WebURL regular expression that supports new TLDs r=nalexander,ahunt
MozReview-Commit-ID: 42dfexg5qCs

--HG--
extra : rebase_source : 1f9461868c1d7ba251f16119cb616c95a1825b69
2016-07-04 16:56:07 -04:00
Jan Henning
3dda0750ac Bug 1282902 - Part 4 - Include zoom level recalculation in session store test. r=sebastian
Because we can't actually rotate the emulator within the test, we just manipulate the session store's stored display size to pretend that the device was rotated between tab data capturing and restoring.

MozReview-Commit-ID: L2HzTLHcBQu

--HG--
extra : transplant_source : %5D%E1%08i%15%E8%14nu%EC0%F8-%B4%3B%0D%11_%13%B3
2016-07-04 22:12:34 +02:00
Jan Henning
47101d08ae Bug 1282902 - Part 3 - Let the MobileViewportManager recalculate the saved resolution if the display width changed before restoring. r=kats
The mobile session store saves the current document resolution in order to restore the previous zoom level when restoring a page. If the display width has changed since the session data was captured (e.g. because the device was rotated), the resolution might have to be scaled appropriately.
Currently, the session store does this scaling by itself by comparing the stored and current window widths, however this implementation is slightly simplified and doesn't cover all use cases, which means some pages can be restored at a wrong zoom level after rotation. To correctly cover all cases, the session store would have to compare viewport widths, too.

Because the MobileViewportManager doesn't wait for the session store to set the restore resolution, the latter has to call setRestoreResolution() as early as possible in order to guarantee that the restore resolution is set before the first paint of the document. Therefore the session store currently calls this after receiving a LocationChange notification. However at that time, the correct viewport for the current document is not yet available, which means the resolution cannot be recalculated by the session store at that point.

Therefore, this patch changes the approach taken and lets the MVM handle all resolution calculations instead. The session store now simply passes the stored previous display dimensions along with the previous document resolution to the MVM, which can then compare them to the current display and viewport widths and scale the resolution appropriately before using it during first paint.


MozReview-Commit-ID: IGxWw87yftK

--HG--
extra : transplant_source : e%8D%BD%26%D2%C3%8E5%E3%2B%C0t%BA%DB%C1%BBs%3F%13%1F
2016-07-01 21:23:25 +02:00
Justin Wood
60e9d13dc3 Bug 1283438 - Set AUTOCLOBBER to empty for l10n r=glandium.
Needed because buildbot clones/checks out from the repo head (of default)
and then updates to the rev for the nightly we're pulling, which can cause
CLOBBER file changes to initiate an unwanted clobber of the object directory
where we just pulled the nightly binary from. Even when CLOBBER hasn't actually
been touched in the changeset range we're looking at between nightlies.

MozReview-Commit-ID: 154d2iZeHgd

--HG--
extra : rebase_source : 504b821955a870cabf6fc727d13e44a33aabb45c
2016-06-30 15:25:55 -04:00
Michael Comella
66c7c16be5 Bug 1283318 - Improve comments for adjust keyfile build config. r=chmanchester
MozReview-Commit-ID: LPI4ZVM9TR

--HG--
extra : rebase_source : 10170667d0061ae58d4bdc3370f130160c3aa8bc
2016-06-29 16:37:09 -07:00
Wes Kocher
4725525760 Merge m-c to fx-team, a=merge CLOSED TREE 2016-07-08 15:04:54 -07:00
Sebastian Kaspari
9a353f444c Bug 1261008 - Do not restore tabs pointing to about:home and with no history. r=janh,ahunt
If the browser is set to always restore the session (default) then we will never
start with an empty session. Even if the user closes all tabs we will re-create
a new tab pointing to about:home. So we will always at least restore this tab on
the next startup. As a consequence we will never open the 'homepage' on app start
because we will never have a non-empty session.

With this patch we won't restore tabs that point to about:home and do not contain
any other history. As a result we might restore an empty session and load the
homepage or about:home (depending on configuration) in a new tab.

In case we decide to not restore the currently selected tab, we just select the
first restored tab if there's any.

MozReview-Commit-ID: DuN03M60Gi8

--HG--
extra : rebase_source : 92ec12d32dfe62ebb0e7ae8e299f579dcd8c1a84
2016-07-06 16:04:01 +02:00
Jan Henning
14cc31c7f4 Bug 1279443 - Don't capture session state during startup before we've restored history. r=sebastian
When restoring tabs on startup, the Java UI creates tab stubs for the tabs from the previous session. The selected foreground tab then starts loading as soon as Gecko is up and running. Meanwhile, the session store gets initialised, too and starts restoring history and other things for that tab.

After history has been restored for an active tab, the session store reloads the current history entry, however by that time, depending on device speed, page size and how many other tabs the session store has to process during startup, the initial page load might have progressed far enough to have already triggered various events monitored by the session store, e.g. "pageshow".

If those events arrive before tab restoring has finished, the session store will attempt to capture that tab's state, which will overwrite the values stored from the previous session. Once the page is then reloaded for restoring, wrong values (e.g. form data, scroll position, zoom level) might then be restored.

Therefore, we now abort any attempts to capture a tab's state
- for all tabs until the "sessionstore-windows-restored" notification has been received as a signal that the initial session restore during startup has finished
- for the restored foreground tab until the location change notification is received after reloading

MozReview-Commit-ID: HbhXcEUnRXQ

--HG--
extra : transplant_source : h%2C%DA%27%28%F0%9F%8F%15-%21F/b%18%B5%DF%F4.%BE
2016-06-29 18:24:13 +02:00
Jan Henning
a8c9dbb72e Bug 1282830 - Trigger session saves when closing zombie tabs, too. r=sebastian
A tab being in a delay-loaded "zombie" state or not shouldn't have any influence on the behaviour of onTabRemove - since we remove it from the session store's sphere of influence, its __SS_data can be safely deleted anyway and whether or not a session save needs to be triggered should depend only on the aNoNotfication parameter passed by the caller.

Otherwise, with the current behaviour, the fact that those tabs have been closed will not get saved to disk if no subsequent session save is triggered through any other means (e.g. selecting a different tab, scrolling, ...) before closing Firefox.

MozReview-Commit-ID: IxjZRRutc7A

--HG--
extra : transplant_source : %3E%21%7B%3F%0Cv%01%82%AC%97%E6p%C5X%C3%90%BC%C8%D8%1B
2016-06-28 23:29:57 +02:00
Wes Kocher
b013d99d86 Merge m-c to fx-team a=merge 2016-07-07 11:38:52 -07:00
Carsten "Tomcat" Book
e9a4666c05 Merge mozilla-central to autoland 2016-07-07 11:44:49 +02:00
Ting-Yu Lin
9c880ca0ff Bug 1266922 - Remove checking "visibilitychange" reason from ActionBarHandler.js. r=sebastian
After bug 1249201 landed, the "visibilitychange" reason wasn't
dispatched during scrolling anymore. See bug 1249201 comment 44 for the
reasoning.

MozReview-Commit-ID: AhHiWeR2fq7

--HG--
extra : rebase_source : 368942f3f08f305524de8a65c16cc12a702410f4
2016-07-06 13:35:46 +08:00
Gregory Szorc
54888373fe Merge mozilla-central to autoland 2016-07-06 18:17:03 -07:00
Carsten "Tomcat" Book
8e2d371484 merge fx-team to mozilla-central a=merge 2016-07-06 11:41:53 +02:00
Alastor Wu
377ac4f207 Bug 1282410 - part2 : open media with external apps. r=Margaret
MozReview-Commit-ID: KQDmOf2RURN

--HG--
extra : rebase_source : 95f26f3c2ded17008bd9201ff9a74cb52c39c92d
2016-07-06 10:53:53 +08:00
Alastor Wu
3d564c05b3 Bug 1282410 - part1 : open unsupported type media. r=cpearce
MozReview-Commit-ID: 4fjkDlRgdt7

--HG--
extra : rebase_source : a59607b1236c0047b97d7ca05002f1960e20ce51
2016-07-06 10:34:29 +08:00
Wes Kocher
59c25d40ac Merge m-c to fx-team, a=merge 2016-07-05 17:13:25 -07:00
Kartikaya Gupta
8296f93061 Bug 1283582 - Stop displaying the context menu in Fennec if web content did a preventDefault on the event. r=margaret
MozReview-Commit-ID: 4JQwXNfJxip
2016-07-05 10:09:38 -04:00
Wes Kocher
7c9b5f12a6 Merge m-c to autoland, a=merge 2016-07-05 17:14:16 -07:00
Nick Alexander
2b02330db2 Bug 1281890 - Allow setting chromeURI from Java. r=snorp
The intention is that GeckoView consumers will not use browser.xul,
but instead geckoview.xul; and that they'll provide content URLs from
their assets/ directories.  This lets them do things without modifying
the omnijar and in particular without setting Gecko's prefs *before*
Gecko startup.

MozReview-Commit-ID: 2QLQQ5RphFu

--HG--
extra : rebase_source : b80eb1b15a54dac3c19ba9c7bfe4f0ac7dae78c6
2016-06-23 12:05:17 -07:00
Carsten "Tomcat" Book
79d581d66d Merge mozilla-central to fx-team 2016-07-07 11:43:24 +02:00
Edouard Oger
d31d567985 Bug 1250782 - Add FxA registration details to the debug_dump command. r=nalexander
MozReview-Commit-ID: COoizpkNHaT

--HG--
extra : transplant_source : %87%07%02%D5b%D2%1D%8Al%C2%C8%BB%D4%F4%E7%91%22i%A2%B8
2016-06-30 12:31:45 -07:00
Jim Chen
dbbc213968 Bug 1280446 - Create PushService if needed; r=snorp
If PushService has not been created when getInstance is called, create
the PushService instead of throwing an error. This fixes a possible race
condition between initializing PushService and receiving a push message,
where we can receive a push message first.
2016-07-05 14:34:57 -04:00
Maja Frydrychowicz
6515d43fbd Bug 787203 - Enable Marionette on debug Fennec build (android-api-15-debug); r=gps
MozReview-Commit-ID: 5suN2OXoHuO

--HG--
extra : rebase_source : 190ca3e2d71a4189d933677c415e3829f785a15e
2016-06-08 16:32:45 -04:00
Maja Frydrychowicz
07464f6507 Bug 787203 - Get Marionette working in Fennec; r=automatedtester
MozReview-Commit-ID: LAymLrmFBSC

--HG--
extra : rebase_source : 30bb2753c161f60eff7293e963fbe206449373b5
2016-06-30 17:03:41 -04:00
Gregory Szorc
f21ec324a6 Merge mozilla-central to mozilla-inbound 2016-07-06 18:30:58 -07:00
Gregory Szorc
021d3fdfc7 Merge mozilla-central to mozilla-inbound 2016-07-06 18:26:17 -07:00
Gregory Szorc
1485dff75a Merge autoland to mozilla-central; a=merge
--HG--
extra : amend_source : cb410b4de973dc55c63e3fa8c088f71a5c00e51e
2016-07-06 18:11:34 -07:00
Kartikaya Gupta
538a46e316 Bug 1251038 - Enable APZ by default in all.js. r=botond
The only platform for which this change is *not* a no-op is Mulet. Last time
I checked Mulet worked fine with APZ enabled but there were a few test failures.
Now I don't believe it's running in automation anyhwere so that shouldn't be
an issue. If it is, they can re-disable APZ easily enough if needed.

MozReview-Commit-ID: 5xKUuTOnubM
2016-07-06 15:19:32 -04:00
Edouard Oger
89b4dbd676 Bug 1250782 - FxAccountClient: remove post method unused argument delegate. r=eoger
MozReview-Commit-ID: 7jqQ7KWZJf2

--HG--
extra : transplant_source : %AAE%FCK%E0%DF%23%95%1A%3F%DF%F0%83%E9%D9V%8A%13%97%3F
2016-05-26 15:47:00 -07:00
Carsten "Tomcat" Book
039a58cf58 Backed out changeset 142caeafd119 (bug 1286663) 2016-07-21 08:18:23 +02:00
Carsten "Tomcat" Book
e8bc59a87a Backed out changeset 684888aeee81 (bug 1287946) 2016-07-21 08:07:12 +02:00
Carsten "Tomcat" Book
27ff1866d4 Backed out changeset d8a07729a34c (bug 1286663) 2016-07-21 08:04:52 +02:00
Jim Chen
78f67d1f6f Bug 1287946 - Update existing code to use mozilla::java; r=me 2016-07-21 00:42:26 -04:00
Jim Chen
5a01a39bfc Bug 1286663 - Remove THUMBNAIL event from GeckoEvent; r=snorp
Remove the now-obsolete THUMBNAIL event from GeckoEvent, as well as its
implementations in nsAppShell and AndroidBridge.
2016-07-21 00:41:13 -04:00
Jim Chen
03bf5be5b2 Bug 1286663 - Add request thumbnail native method to ThumbnailHelper; r=snorp
Add and use a request thumbnail native method call in ThumbnailHelper,
instead of using the THUMBNAIL event in GeckoEvent.
2016-07-21 00:41:13 -04:00
Jim Chen
49c7dfbdde Bug 1286925 - Remove screen orientation event from GeckoEvent; r=snorp
Remove the now-obsolete SCREENORIENTATION_CHANGED event from GeckoEvent.
2016-07-20 21:44:48 -04:00
Jim Chen
0d2e7fcb1d Bug 1286925 - Add orientation change method in GeckoScreenOrientation; r=snorp
Add and use the onOrientationChanged native method in
GeckoScreenOrientation in place of the screen orientation event in
GeckoEvent.
2016-07-20 21:44:48 -04:00
Jim Chen
deae801637 Bug 1286662 - Remove network events from GeckoEvent; r=snorp
Remove the now-obsolete network events from GeckoEvent.
2016-07-20 21:44:48 -04:00
Jim Chen
071e1acf10 Bug 1286662 - Add native methods for GeckoNetworkManager notifications; r=snorp
Add and use onConnectionChanged and onStatusChanged native methods in
GeckoNetworkManager in place of the network events in GeckoEvent.
2016-07-20 21:44:48 -04:00
Jim Chen
44909016ff Bug 1285572 - Remove Fennec command-line handler; r=snorp
The Fennec CLH is now no longer used for any purpose, so it can be
safely removed.
2016-07-20 21:43:34 -04:00
Jim Chen
fa5754f73b Bug 1285572 - Remove LOAD_URI event; r=snorp
Remove the LOAD_URI event, which is now obsolete, from GeckoEvent.
2016-07-20 21:43:34 -04:00
Jim Chen
0ab038b8c2 Bug 1285572 - Add and use loadUri method in GeckoView; r=snorp
Add a loadUri method in GeckoView that replaces the functionality of the
current LOAD_URI event in GeckoEvent, and make GeckoApp and BrowserApp
use the new call.

The implementation for loadUri differs from the previous implementation
of LOAD_URI by directly calling nsIBrowserDOMWindow::OpenURI, instead of
going through the command-line handler. This more direct approach lets
us get rid of the Fennec command-line handler entirely.
2016-07-20 21:43:34 -04:00
Edouard Oger
974ff34e5f Bug 1250782 - Include fxaDeviceId in sync client records. r=mcomella, nalexander
MozReview-Commit-ID: BjTKTN5XX4w

--HG--
extra : transplant_source : %BCrk%18%D0%5DX%B3%0F%90%BA%83%AEh%BB%BB%C6%A0%E0%29
2016-05-18 13:43:10 -07:00
Edouard Oger
0d35c21fa7 Bug 1250782 - Update device registration on device name change. r=mcomella, nalexander
MozReview-Commit-ID: Cqhej5cfKvE

--HG--
extra : transplant_source : L%98%D9%82%90%C2%85%8C%00%8CF%80w%18%94%CF%F0%B5%7B%14
2016-05-18 12:49:56 -07:00
Edouard Oger
ea3aa620c6 Bug 1250782 - Register device on married state. r=mcomella, nalexander
MozReview-Commit-ID: CswoGEpoNl3

--HG--
extra : transplant_source : %9A%BBW%DC%A1%A5%C4%B9%F8c%0EF/%D9%C9.%B1%97%5B%07
2016-05-18 12:48:49 -07:00
Edouard Oger
ad9c52e341 Bug 1250782 - Add FxAccountDeviceRegistrator. r=mcomella, nalexander
MozReview-Commit-ID: LIHuHxnfW1V

--HG--
extra : transplant_source : %40%3F%C4%CD%24%5B9%9CaR%5C4YUI%EA%C5%C6%12%EB
2016-05-18 12:48:21 -07:00
Edouard Oger
58c682c8d8 Bug 1250782 - FxAccountClient: add deviceList method. r=mcomella
MozReview-Commit-ID: GJ0fDsKkNEl

--HG--
extra : transplant_source : X%AD%08%FA%F9%A6U%CB%A1%99%D6%A3%0CC%B9%9E%5B%CF%9A%D3
2016-05-18 12:36:31 -07:00
Edouard Oger
2c7bb5dd31 Bug 1250782 - FxAccountClient: add registerOrUpdateDevice method. r=mcomella
MozReview-Commit-ID: 6cGQTZq5G1W

--HG--
extra : transplant_source : n%CD%DB%D4Y%FB%3E%A6%E5%CF%0A%FB%3Ca%07%92%F0%60%95%A3
2016-05-18 12:35:50 -07:00
Edouard Oger
aa9e80a40f Bug 1250782 - FxAccountClient: add accountStatus method and rename status method to recoveryEmailStatus. r=mcomella
MozReview-Commit-ID: 3fFQaFe14x2

--HG--
extra : transplant_source : %E1%EF%01%D2%1A%D0%A4%14%15%E6%CD%3E%ED%AD%F2%D4EE%1C%01
2016-05-18 12:28:51 -07:00
Edouard Oger
46fd9a4c88 Bug 1250782 - ResourceDelegate#handleSuccess now gives access to a JsonArray body. r=mcomella
MozReview-Commit-ID: HbRgCaMPZY7

--HG--
extra : transplant_source : %17%E9g%B6/%25%D9d%12%20B%06%E0%5Dv%B8%29%BBCO
2016-05-18 12:32:55 -07:00
Edouard Oger
59547c83f5 Bug 1250782 - Allow MozResponse to return a Json array body. r=mcomella
MozReview-Commit-ID: B40vvA0E7xJ

--HG--
extra : transplant_source : %D4%99M%CE%A2%28Dj%3EA%18%06%91%82%AF%86Q%A2%11j
2016-05-18 12:22:49 -07:00
Sebastian Kaspari
c477247a23 Bug 1283627 - Update home pager immediately after restoring tabs. r=JanH
MozReview-Commit-ID: IidO1rCmeb0

--HG--
extra : rebase_source : b13291d1a6e0d7909ccf2b3a58a74fd769fc03d7
2016-07-13 16:15:19 +02:00
Grigory Kruglov
b4787fd138 Bug 1278644 - Stable getItemID implementation for ClientsAdapter r=sebastian
MozReview-Commit-ID: AH0wgVKBMYo

--HG--
extra : rebase_source : 34e97821cbcf4211ebd87317435be8e5dfeec58a
2016-06-28 17:18:23 -07:00
Grigory Kruglov
10457d8050 Bug 1278644 - Stable getItemId implementation for VisitedAdapter r=sebastian
MozReview-Commit-ID: AwiwGAVRA3k

--HG--
extra : rebase_source : 2af8f4e2b77977b2d634c8f013aaa5ef5b3ee517
2016-06-28 16:04:09 -07:00
Grigory Kruglov
76dad02030 Bug 1278644 - Stable getItemId implementation for CombinedHistoryAdapter r=sebastian
MozReview-Commit-ID: EylBNeI9Xwp

--HG--
extra : rebase_source : 2da5ae91c3f8cc13078a6b1b252463cf2681d2e7
2016-06-28 15:16:59 -07:00
Randall Barker
d0dd0a4bbe Bug 1284570 - Android APZ fling can end up with a NaN velocity r=snorp 2016-07-05 15:46:47 -07:00
Jan Henning
71cbfb28c0 Bug 1284013 - Part 2 - Reduce session store save delays when in background. r=sebastian
When we are backgrounded and Android's onPause() handler runs, we try to synchronously flush out any pending session store to storage. If however some tab events (e.g. tab closing) have been dispatched shortly before the application backgrounding, it is possible that they'll arrive at the session store after the "application-background" event. In this case, we need to process and write them to storage as fast as possible, as we can be killed at any moment now.

Therefore the delay between successive writes is completely abolished while the application is in background.
The minimum delay between a call to saveStateDelayed() and a write operation however is not completely eliminated and instead only reduced to 200 ms, so as to allow for closely following tab events (e.g. closing a tab involves both a TabSelect and TabClose event) to be batched together in one write operation.

MozReview-Commit-ID: I8q7z4kll7O

--HG--
extra : transplant_source : %DA%23%3F%82%92%1E%A8%F5%60%84U%A5%92%FAmcT%A7%D0%AA
2016-04-17 22:06:06 +02:00
Jan Henning
efadd57e7b Bug 1284013 - Part 1 - Use temp file for synchronous writes, too. r=sebastian
Currently, sync writes go directly to the destination file, so an interrupted write will leave the session store data in an inconsistent state. To minimise the incidence of this occurring as far as possible, we now mimic the behaviour of atomicWrite when a tmpPath is set and write to a temporary file which is then renamed to the actual destination file after writing has finished.

MozReview-Commit-ID: 3f3z1s0hfl8

--HG--
extra : transplant_source : %A7%88y%1D%23%B6%D0%AE%BC%E54R%24%09%E1D%92%0F%8D%3C
2016-04-17 18:22:36 +02:00
Jan Henning
1f19675455 Bug 1284013 - Part 0 - Fix session store logging logic. r=sebastian
MozReview-Commit-ID: EGQzejCPNyS

--HG--
extra : transplant_source : %03.c%B4%BBm%C6%7F%E7%CD%E9%B0%B6%DD%E2_%BBh%01%E1
2016-05-29 16:52:49 +02:00
Tarek Ziadé
4b4d7ebc98 Bug 1271860 - Move switchboard logic to client to consume JSON config directly - r=sebastian
MozReview-Commit-ID: C3W8qf2nbVq

--HG--
extra : rebase_source : f6366592731771a53a300b4d9e919a4105d468b8
2016-07-05 15:55:54 +02:00
Alastor Wu
eaa4a7e589 Bug 1284754 - modify typo error for the event openMediaWithExternalApp. r=jwwang
MozReview-Commit-ID: 1WeniGeQlqa

--HG--
extra : rebase_source : bfd3a68dfcc917d82495369ee70ca9c6351f10a3
2016-07-06 15:07:21 +08:00
Gijs Kruitbosch
8a136be192 Bug 1254036 - skip irrelevant paints when looking for layout having happened, r=sebastian,smaug
MozReview-Commit-ID: DDuHa5Sl2lg

--HG--
extra : rebase_source : 149ffb2307f63c63648d2fcc24f67609721b7050
2016-03-21 16:24:31 +00:00
Jim Chen
ce45a595ab Bug 1287946 - Update existing code to use mozilla::java; r=me 2016-07-21 13:49:04 -04:00
Jim Chen
2f32c11585 Bug 1286663 - Remove THUMBNAIL event from GeckoEvent; r=snorp
Remove the now-obsolete THUMBNAIL event from GeckoEvent, as well as its
implementations in nsAppShell and AndroidBridge.
2016-07-21 13:49:04 -04:00
Jim Chen
79f19ad9df Bug 1286663 - Add request thumbnail native method to ThumbnailHelper; r=snorp
Add and use a request thumbnail native method call in ThumbnailHelper,
instead of using the THUMBNAIL event in GeckoEvent.
2016-07-21 13:49:04 -04:00
Tom Klein
fa5b0ee6cb Bug 1031519 - Use immersive fullscreen when available. r=mcomella
This is Deepthi Venkitaramanan's patch with feedback comments addressed.

MozReview-Commit-ID: 7vs0ZgefOVy

--HG--
extra : rebase_source : b45ded1517cf05acb04778219cd5860c1afdfcb5
2016-07-18 18:50:47 -05:00
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Carsten "Tomcat" Book
3a42c363cc merge mozilla-inbound to mozilla-central a=merge 2016-06-30 12:33:41 +02:00
James Willcox
dfd9e9a816 Bug 1280666 - Expose velocity (speed) from StackScroller and use in APZC r=rbarker 2016-06-29 17:09:55 -07:00
James Willcox
75d5558c2f Bug 1280666 - Use StackScroller from Chrome for fling animations r=rbarker 2016-06-29 17:09:55 -07:00
James Willcox
718f23f9d0 Bug 1280666 - Allow class annotations to set defaults for members when generating Java bindings r=jchen 2016-06-29 17:09:55 -07:00
Matthew Wein
569e667c08 Bug 1270742 - Add support for default_icon in chrome.pageAction r=kmag
MozReview-Commit-ID: D9uR0JUXJwx

--HG--
extra : transplant_source : %FC%FBu%0Cboh%DFv%BB%8D%AC%20%ED%A5%E1%3E%DE%126
2016-05-23 15:59:33 -07:00
Cykesiopka
9533a3d17b Bug 1281661 - Ensure input to NSSDialogService prompt messages are HTML escaped to avoid HTML injection. r=kats,keeler
As of the writing of this patch, NSSDialogService pops up a prompter on
Android as follows (assuming at least one label is requested):
1. NSSDialogService.js calls Prompt.jsm methods and eventually requests the
   prompt be displayed.
2. Prompt.jsm sends a messages to the Java side.
3. The Java side receives the message and eventually calls
   org.mozilla.gecko.prompts.PromptInput.LabelInput.getView().
4. LabelInput.getView() calls android.text.Html.fromHtml().

At no point is any HTML injection prevention done, so in theory NSSDialogService
could be an injection vector.

In practice, it appears that fromHtml() doesn't actually allow anything malicious
to be done. This patch introduces HTML escaping at the NSSDialogService
level just to be safe.

MozReview-Commit-ID: LhHuZKSqx01

--HG--
extra : transplant_source : l%C9%A2%95%9A.%05%1F%CF%5D%02%5E%12N%C1%B7O%7C%1B%8B
2016-06-29 18:48:49 -07:00
Jonathan Almeida (:jonalmeida)
7126808eeb Bug 1268608 - Toolbar hiding should be a snappy, constant speed r=sebastian
By changing the Interpolator to be linear instead of decelerating, we should
see an animation with constant speed. I've also reduced the animation time
from 250 milliseconds to 150 to give it a snappier feel.

MozReview-Commit-ID: LBsdxG0lyvX

--HG--
extra : rebase_source : ef2f1fb0d9e18ce4f23932355e40888355411b36
extra : amend_source : f9f1a0763ac785c4e115a5be78fddb7a83000270
2016-06-23 08:16:51 -07:00
Grigory Kruglov
5291e6bd1b Bug 1280409 - Guard against cursor failures while migrating data from HistoryExtensionsDB r=sebastian
MozReview-Commit-ID: 138SK46rgfi

--HG--
extra : rebase_source : 5c135250a81088bb5c838a4abd352fbbe80ae8d7
2016-06-23 06:04:59 -07:00
Grigory Kruglov
c45d52c91f Bug 1278301 - Exclude history items from Top Sites which were not visited locally r=sebastian
MozReview-Commit-ID: 7wFOwvIz4k4

--HG--
extra : rebase_source : 5cba7d932f4ff4e2fd8d4868500e0071f4b2b3fa
2016-06-28 17:33:21 -07:00
SUN Haitao
bacd8f992e Bug 1282222 - Make the PersistentNotificationHandler handle 'persistent-notification-close' ;r=kitcambridge
MozReview-Commit-ID: 4S4ijAQV2tG

--HG--
extra : transplant_source : %40%9F%F3%B0%9C%E8u%CB%CAv%2AN%144%97%D3%FD%C5nt
2016-06-25 23:58:03 +08:00
SUN Haitao
e4f71beba8 Bug 1282222 - Add a 'deleteIntent' parameter to the 'NotificationClient.add' method ;r=jchen
MozReview-Commit-ID: GOwCi2LkFTm

--HG--
extra : transplant_source : %20%5E%ABJ%3Ey%B7C%91%82%B8T%E2%A7%EF%1A8%EE%E3%9C
2016-06-25 23:17:50 +08:00
SUN Haitao
3f32818ede Bug 1282222 - Clean up 'NotificationClient.java' ;r=jchen
MozReview-Commit-ID: 141QdoXyWaf

--HG--
extra : transplant_source : %E8G%D7M%EFKu%8C%90%F3oGe%9BO%40%FA%F0%01P
2016-06-26 11:41:11 +08:00
Michael Comella
90db3fb96b Bug 1280405 - Add windowActionBar to theme in base configuration. r=ahunt
MozReview-Commit-ID: GCCzveppDDl

--HG--
extra : rebase_source : dcaa7a5138439e4aa0ef91f8c560b469fe4a0200
extra : source : 1abbe06c608ed0c8e83c17f9aeb803de1510eefd
2016-06-27 15:40:33 -07:00
Grigory Kruglov
006cafb26b Bug 1282621 - Let GeckoAppShell queue up network state events if GeckoThread isn't in RUNNING state r=sebastian
When launching fennec while device is offline, we would often not send these events to Gecko,
and it wouldn't know to load tabs from cache. sendEventToGecko would queue up our events for us if GeckoThread isn't
in the RUNNING state, so let's rely on that mechanism instead. It's possible that we will have a succession of network
state events which aren't valid by the time they're actually sent, but as long as event queue is FIFO, it should be ok.

MozReview-Commit-ID: BCiO2EozUnx

--HG--
extra : rebase_source : 3935444f69be9171aa60a8f4b3e5db29035ecb6c
2016-06-27 17:29:25 -07:00
Grigory Kruglov
62bfd62453 Bug 1282621 - Pre: correctly treat results of registerReceiver call r=sebastian
registerReceiver returns the first sticky intent which matches our filter, or null
if there aren't any. Remove the log statement about "failed registration", since null just
means that we haven't had any sticky broadcasts for this filter yet.

MozReview-Commit-ID: KA2Rxt2fk2T

--HG--
extra : rebase_source : 37adcb2a240f36466a95bc34c904dece422e9bbd
2016-06-27 17:24:18 -07:00
Andrzej Hunt
9530eee446 Bug 1228593 - Save session store data when quitting fennec r=janh
MozReview-Commit-ID: 13zaHfYgB3U

--HG--
extra : rebase_source : d30d975ca6bfd6e0a9e63fadc526c34cf3f85324
2016-06-07 13:48:19 -07:00
Carsten "Tomcat" Book
bd81760f9c Merge mozilla-central to fx-team 2016-06-28 16:14:58 +02:00
Carsten "Tomcat" Book
261fe13dcd merge mozilla-inbound to mozilla-central a=merge 2016-06-28 16:09:05 +02:00
Carsten "Tomcat" Book
faeec86517 merge fx-team to mozilla-central a=merge 2016-06-28 16:06:34 +02:00
Carsten "Tomcat" Book
c1cb5a12bd Backed out changeset 00312b136937 (bug 968273) for causing regressions 2016-06-28 10:03:25 +02:00
Sebastian Kaspari
e3ba50f742 Bug 1266369 - FloatingToolbarTextSelection: Add an offset to the content rect to avoid overlap. r=ahunt
MozReview-Commit-ID: HNkTOAS7toJ

--HG--
extra : rebase_source : abac9b07dc349624139b241dfaed708be7b0b6f6
2016-06-27 13:47:32 +02:00
Sebastian Kaspari
788773e232 Bug 1266369 - (Pre) FloatingToolbarTextSelection: Add final keyword where feasible. r=ahunt
MozReview-Commit-ID: DF7qmGXMfEy

--HG--
extra : rebase_source : b6f80574151901304755cc114bd3e136cac25bb0
2016-06-27 11:51:32 +02:00
Andrzej Hunt
ac79e826e2 Bug 1280539 - don't open topsites into reader view if stored as offline reader-view page r=sebastian
By default, i.e. for most lists in the homepanels, we want to open the offline reader-view version
of a page if the page is stored as an offline reader-view bookmark (TwoLinePageRow shows the bookmark
and offline status for pages, not only in bookmarks, but also in the list of top sites, awesomescreen
results, and history). The only exception is the topsites grid, where we don't offer any indication
of the bookmark or offline status of a page. For now the expectation is that topsites open the
normal version of a page, so we need to bypass the usual flow for that case.

(It's possible the UI around this would change in future, but with the current UI this is probably
 the most obvious / least frustrating behaviour.)

MozReview-Commit-ID: BMpGG4KQ62w

--HG--
extra : rebase_source : a223304451e46e1c0429c5b3bcd9be6d43bf9428
extra : amend_source : 462ea5b54781fd8c534a4a4a484fd60714e3f40d
2016-06-27 22:23:08 +02:00
Wes Kocher
c73d13f1bb Merge m-c to fx-team, a=merge 2016-06-27 14:09:55 -07:00
Andrzej Hunt
c44bdd8061 Bug 1235599 - Add basic UrlMetadata tests r=mcomella
MozReview-Commit-ID: J7zSI7E9jb7

--HG--
extra : rebase_source : c94250f0bdff18c7f1b1dc4fe3de3a5daaab03e9
2016-06-06 13:08:55 -07:00
Andrzej Hunt
2d9c9a3ae2 Bug 1235599 - Make UrlMetadataTable.CONTENT_URI public to allow using in tests r=mcomella
MozReview-Commit-ID: EFDX4uihBqz

--HG--
extra : rebase_source : 94016bc76e857681b3cf223038617223d8e13056
2016-06-06 13:06:43 -07:00
Grigory Kruglov
fb7d509986 Bug 1278980 - Add OPENED_FROM_TABS_TRAY event, and use it to trigger "offline version" snackbar r=sebastian
For now, this event is only going to be used to cover a narrow edge case around
display of the "Showing offline version" snackbar, so let's not overthink it.

MozReview-Commit-ID: Cd9q7kwnjjQ

--HG--
extra : rebase_source : ebf8656565fef1b6969fb89de20fdd62a64e5043
2016-06-24 18:06:55 -07:00
Sebastian Kaspari
b5e1002bdb Bug 1282423 - browser.js: Fix wrong open search expression. r=margaret
MozReview-Commit-ID: KUXP4qcV7sM

--HG--
extra : rebase_source : ac0a1c618445621e779f04d721b9192d8ea2c84e
2016-06-27 15:33:35 +02:00
Thomas Nguyen
6075feb383 Bug 1025965 - Migrate browser.safebrowsing.enabled to browser.safebrowsing.phishing.enabled. r=paolo.mozmail
MozReview-Commit-ID: KFWofvaZuw7
2016-06-23 12:25:32 +08:00
Andrzej Hunt
ba3a5ca06f Bug 1282372 - Remove tab count transparency/flickering workaround r=sebastian
This issue has been fixed in the latest Android N preview, we should
remove the workaround to simplify the code.

MozReview-Commit-ID: 6xwIA5QzzhQ

--HG--
extra : rebase_source : dc84f80591ffe2fe779c1649f15376cc29d32662
2016-06-27 10:22:18 +02:00
Phil Ringnalda
98d7a9d9c5 Merge m-i to m-c, a=merge 2016-06-25 16:23:43 -07:00