Add a blocking version of the sync promo dialog

chrome/browser/ui/browser_init.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_
 #define CHROME_BROWSER_UI_BROWSER_INIT_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 223 matching lines @@
     void AddStartupURLs(std::vector<GURL>* startup_urls) const;
 
     // Checks whether Chrome is still the default browser (unless the user
     // previously instructed not to do so) and warns the user if it is not.
     void CheckDefaultBrowser(Profile* profile);
 
     // Checks whether Chrome should show the 'Chrome was auto-started' infobar.
     // Returns true if so.
     bool CheckIfAutoLaunched(Profile* profile);
 
+    // Shows a sync promo dialog if necessary. When called |browser| should be
+    // the browser that's being used for startup. On return |browser| is set
+    // to the browser spawned from the sync promo dialog (if any). On input
+    // |tabs| should be the set of tabs to show on startup.  On return |tabs|
+    // will contain the new set of tabs to show on startup. Returns the index
+    // of the tab to activate.
+    size_t ShowSyncPromoDialog(Browser** browser,
+                               bool process_startup,

[sky, 2012/01/30 23:08:14]

out params should be last, so make process_startup the first param

[sail, 2012/01/30 23:45:53]

Done.

+                               std::vector<Tab>* tabs);
+
     const FilePath cur_dir_;
     const CommandLine& command_line_;
     Profile* profile_;
     BrowserInit* browser_init_;
     bool is_first_run_;
     DISALLOW_COPY_AND_ASSIGN(LaunchWithProfile);
   };
 
  private:
   friend class CloudPrintProxyPolicyTest;
@@ skipping 30 matching lines @@
 
   // True if we have already read and reset the preference kWasRestarted. (A
   // member variable instead of a static variable inside WasRestarted because
   // of testing.)
   static bool was_restarted_read_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_