|
|
@ -32,6 +32,7 @@ |
|
|
|
chrome/browser/first_run/upgrade_util.h | 2 |
|
|
|
chrome/browser/hid/hid_chooser_context.cc | 5 |
|
|
|
chrome/browser/lifetime/application_lifetime.cc | 22 |
|
|
|
chrome/browser/lifetime/application_lifetime.h | 4 |
|
|
|
chrome/browser/lifetime/browser_shutdown.cc | 6 |
|
|
|
chrome/browser/lifetime/browser_shutdown.h | 4 |
|
|
|
chrome/browser/media/router/media_router.h | 4 |
|
|
@ -76,7 +77,6 @@ |
|
|
|
chrome/browser/search/local_ntp_source.h | 2 |
|
|
|
chrome/browser/search/most_visited_iframe_source.h | 2 |
|
|
|
chrome/browser/sessions/session_restore.cc | 25 |
|
|
|
chrome/browser/sessions/session_restore_android.cc | 27 |
|
|
|
chrome/browser/sharing/shared_clipboard/feature_flags.cc | 2 |
|
|
|
chrome/browser/sharing/shared_clipboard/feature_flags.h | 2 |
|
|
|
chrome/browser/storage/storage_notification_service_impl.cc | 2 |
|
|
@ -193,6 +193,7 @@ |
|
|
|
ui/base/dragdrop/os_exchange_data_provider_factory.cc | 4 |
|
|
|
ui/events/event.h | 1 |
|
|
|
ui/native_theme/native_theme_android.cc | 3 |
|
|
|
ui/native_theme/native_theme_android.h | 2 |
|
|
|
ui/views/controls/menu/menu_controller.h | 1 |
|
|
|
ui/views/controls/menu/menu_host.cc | 8 |
|
|
|
ui/views/controls/menu/menu_host.h | 2 |
|
|
@ -213,7 +214,7 @@ |
|
|
|
ui/views/widget/widget.cc | 6 |
|
|
|
weblayer/browser/browser_context_impl.cc | 2 |
|
|
|
weblayer/browser/browser_context_impl.h | 2 |
|
|
|
214 files changed, 3129 insertions(+), 625 deletions(-) |
|
|
|
215 files changed, 3132 insertions(+), 601 deletions(-) |
|
|
|
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/chrome/browser/web_applications/components/web_app_shortcut_android.cc
|
|
|
@ -2006,6 +2007,21 @@ |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
--- a/ui/native_theme/native_theme_android.h
|
|
|
|
+++ b/ui/native_theme/native_theme_android.h
|
|
|
|
@@ -20,11 +20,11 @@ class NativeThemeAndroid : public Native
|
|
|
|
const ExtraParams& extra) const override; |
|
|
|
SkColor GetSystemColor(ColorId color_id, |
|
|
|
ColorScheme color_scheme) const override; |
|
|
|
+ static NativeThemeAndroid* instance();
|
|
|
|
|
|
|
|
protected: |
|
|
|
friend class NativeTheme; |
|
|
|
friend class base::NoDestructor<NativeThemeAndroid>; |
|
|
|
- static NativeThemeAndroid* instance();
|
|
|
|
|
|
|
|
// NativeThemeBase: |
|
|
|
void AdjustCheckboxRadioRectForPadding(SkRect* rect) const override; |
|
|
|
--- a/content/browser/storage_partition_impl.h
|
|
|
|
+++ b/content/browser/storage_partition_impl.h
|
|
|
|
@@ -50,7 +50,7 @@
|
|
|
@ -4742,39 +4758,6 @@ |
|
|
|
bool SessionRestore::IsRestoring(const Profile* profile) { |
|
|
|
if (active_session_restorers == nullptr) |
|
|
|
return false; |
|
|
|
--- a/chrome/browser/sessions/session_restore_android.cc
|
|
|
|
+++ b/chrome/browser/sessions/session_restore_android.cc
|
|
|
|
@@ -61,30 +61,3 @@ std::vector<Browser*> SessionRestore::Re
|
|
|
|
NOTREACHED(); |
|
|
|
return std::vector<Browser*>(); |
|
|
|
} |
|
|
|
-
|
|
|
|
-// static
|
|
|
|
-void SessionRestore::AddObserver(SessionRestoreObserver* observer) {
|
|
|
|
- observers()->AddObserver(observer);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-// static
|
|
|
|
-void SessionRestore::RemoveObserver(SessionRestoreObserver* observer) {
|
|
|
|
- observers()->RemoveObserver(observer);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-// static
|
|
|
|
-bool SessionRestore::IsRestoring(const Profile* profile) {
|
|
|
|
- return false;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-// static
|
|
|
|
-Browser* SessionRestore::RestoreSession(
|
|
|
|
- Profile* profile, Browser* browser,
|
|
|
|
- SessionRestore::BehaviorBitmask behavior,
|
|
|
|
- const std::vector<GURL>& urls_to_open) {
|
|
|
|
- return nullptr;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-// static
|
|
|
|
-base::ObserverList<SessionRestoreObserver>::Unchecked*
|
|
|
|
- SessionRestore::observers_ = nullptr;
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/chrome/browser/obsolete_system/obsolete_system_android.cc
|
|
|
|
@@ -0,0 +1,25 @@
|
|
|
@ -6829,3 +6812,23 @@ |
|
|
|
base::FilePath GetPath() override; |
|
|
|
bool IsOffTheRecord() override; |
|
|
|
content::ResourceContext* GetResourceContext() override; |
|
|
|
--- a/chrome/browser/lifetime/application_lifetime.h
|
|
|
|
+++ b/chrome/browser/lifetime/application_lifetime.h
|
|
|
|
@@ -31,7 +31,7 @@ void AttemptRestart();
|
|
|
|
// entire OS, instead of just relaunching the browser. |
|
|
|
void AttemptRelaunch(); |
|
|
|
|
|
|
|
-#if !defined(OS_ANDROID)
|
|
|
|
+#if defined(OS_ANDROID)
|
|
|
|
// Starts an administrator-initiated relaunch process. On platforms other than |
|
|
|
// Chrome OS, this relaunches the browser and restores the user's session. On |
|
|
|
// Chrome OS, this restarts the entire OS. This differs from AttemptRelaunch in |
|
|
|
@@ -62,7 +62,7 @@ void ExitIgnoreUnloadHandlers();
|
|
|
|
bool IsAttemptingShutdown(); |
|
|
|
#endif |
|
|
|
|
|
|
|
-#if !defined(OS_ANDROID)
|
|
|
|
+#if defined(OS_ANDROID)
|
|
|
|
// Closes all browsers and if successful, quits. |
|
|
|
void CloseAllBrowsersAndQuit(); |
|
|
|
|
|
|
|