Android multi-instance tab model merging
Merge tabs from one chrome instance into the other when:
1. Activity is put back in fullscreen after previously being in multi-window mode
2. Activity is refocused in fullscreen after previously being in multi-window mode
3. Cold start
This is the core implementation, placed behind a flag, with a few TODOs (e.g.
handling merges that are interrupted part of the way through).
BUG=602498
Review-Url: https://codereview.chromium.org/2140923002
Cr-Commit-Position: refs/heads/master@{#406361}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 4e6d852..f03eb3a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2005,8 +2005,13 @@
ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
chromeos::switches::kDisableFilesQuickView)},
#endif // defined(OS_CHROMEOS)
- // NOTE: Adding new command-line switches requires adding corresponding
- // entries to enum "LoginCustomFlags" in histograms.xml. See note in
+#if defined(OS_ANDROID)
+ {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME,
+ IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid,
+ SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)},
+#endif
+ // NOTE: Adding new command-line switches requires adding corresponding
+ // entries to enum "LoginCustomFlags" in histograms.xml. See note in
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
};
