Add a blocking version of the sync promo dialog

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 45 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_dialog.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 1058 matching lines @@
 
 Browser* BrowserInit::LaunchWithProfile::OpenURLsInBrowser(
     Browser* browser,
     bool process_startup,
     const std::vector<GURL>& urls) {
   std::vector<Tab> tabs;
   UrlsToTabs(urls, &tabs);
   return OpenTabsInBrowser(browser, process_startup, tabs);
 }
 
+size_t BrowserInit::LaunchWithProfile::ShowSyncPromoDialog(

[sky, 2012/01/30 18:13:41]

Make position match that of header.

[sail, 2012/01/30 21:00:39]

Done.

+    Browser** browser,
+    bool process_startup,
+    std::vector<Tab>* tabs) {
+  DCHECK(browser);
+  DCHECK(tabs);
+
+  if (!profile_ || *browser || !process_startup ||

[Dan Beam, 2012/01/30 18:10:05]

You may want to leave comment clarifying what you're doing here.  I'm assuming
you don't have a ! in front of *browser as you're overwriting this later on?

[sail, 2012/01/30 21:00:39]

Done.

+      SyncPromoUI::GetSyncPromoVersion() != SyncPromoUI::VERSION_DIALOG) {
+    return std::string::npos;
+  }
+
+  for (size_t i = 0; i < tabs->size(); ++i) {
+    GURL url((*tabs)[i].url);
+    if (url.SchemeIs(chrome::kChromeUIScheme) &&
+        url.host() == chrome::kChromeUISyncPromoHost) {
+      SyncPromoDialog dialog(profile_, url);
+      dialog.ShowDialog();
+      *browser = dialog.spawned_browser();
+      if (dialog.sync_promo_was_closed()) {
+        tabs->erase(tabs->begin() + i);
+        return 0;

[sky, 2012/01/30 18:13:41]

I don't understand the return value here. CAn you add comments to clarify why
it's 0 and 1 and doesn't relate to i in anyway.

[sail, 2012/01/30 21:00:39]

Done.

+      } else {
+        return 1;
+      }
+    }
+  }
+
+  return std::string::npos;
+}
+
 Browser* BrowserInit::LaunchWithProfile::OpenTabsInBrowser(
         Browser* browser,
         bool process_startup,
-        const std::vector<Tab>& tabs) {
-  DCHECK(!tabs.empty());
+        const std::vector<Tab>& in_tabs) {
+  DCHECK(!in_tabs.empty());
+
   // If we don't yet have a profile, try to use the one we're given from
   // |browser|. While we may not end up actually using |browser| (since it
   // could be a popup window), we can at least use the profile.
   if (!profile_ && browser)
     profile_ = browser->profile();
 
+  std::vector<Tab> tabs(in_tabs);
+  size_t active_tab_index =
+      ShowSyncPromoDialog(&browser, process_startup,  &tabs);
+  bool first_tab = active_tab_index == std::string::npos;
+
   if (!browser || !browser->is_type_tabbed()) {
     browser = Browser::Create(profile_);
   } else {
 #if defined(TOOLKIT_GTK)
     // Setting the time of the last action on the window here allows us to steal
     // focus, which is what the user wants when opening a new tab in an existing
     // browser window.
     gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle());
 #endif
   }
 
 #if !defined(OS_MACOSX)
   // In kiosk mode, we want to always be fullscreen, so switch to that now.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
     browser->ToggleFullscreenMode(false);
 #endif
 
-  bool first_tab = true;
   for (size_t i = 0; i < tabs.size(); ++i) {
     // We skip URLs that we'd have to launch an external protocol handler for.
     // This avoids us getting into an infinite loop asking ourselves to open
     // a URL, should the handler be (incorrectly) configured to be us. Anyone
     // asking us to open such a URL should really ask the handler directly.
     bool handled_by_chrome = ProfileIOData::IsHandledURL(tabs[i].url) ||
         (profile_ && profile_->GetProtocolHandlerRegistry()->IsHandledProtocol(
             tabs[i].url.scheme()));
     if (!process_startup && !handled_by_chrome)
       continue;
 
-    int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
-                                TabStripModel::ADD_NONE;
+    size_t index;
+    if (tabs[i].url.SchemeIs(chrome::kChromeUIScheme) &&
+        tabs[i].url.host() == chrome::kChromeUISyncPromoHost) {
+      index = 0;

[sky, 2012/01/30 18:13:41]

Add a comment as to why you're forcing these to appear first.

[sail, 2012/01/30 21:00:39]

Done.

+    } else {
+      index = browser->GetIndexForInsertionDuringRestore(i);
+    }
+
+    int add_types = (first_tab || index == active_tab_index) ?
+        TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE;
     add_types |= TabStripModel::ADD_FORCE_INDEX;
     if (tabs[i].is_pinned)
       add_types |= TabStripModel::ADD_PINNED;
-    int index = browser->GetIndexForInsertionDuringRestore(i);
 
     browser::NavigateParams params(browser, tabs[i].url,
                                    content::PAGE_TRANSITION_START_PAGE);
-    params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+    params.disposition = (first_tab || index == active_tab_index) ?
+        NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
     params.tabstrip_index = index;
     params.tabstrip_add_types = add_types;
     params.extension_app_id = tabs[i].app_id;
     browser::Navigate(&params);
 
     first_tab = false;
   }
   browser->window()->Show();
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
@@ skipping 559 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }