Revert 63005 - If default search is managed, we should not asked the user to choose it at First Run. Make sure the minimum bubble is not showed if there is no default search.

BUG=49306

TEST=Set a managed default search provider.  Clear your Chromium user data directory (~/Library/Chromium, ~/.config/chromium, %localappdata%\Chromium) and the "First Run" file found next to the executable.  Start Chrome.  It should not ask you to choose a default search provider.  Disable the default search provider via policy.  Make sure the minimal bubble is not shown. Redo these tests for the GOOGLE_CHROME_BUILD to make sure that we still ask about usage stats.

Review URL: http://codereview.chromium.org/3565013

TBR=jeanluc@google.com
Review URL: http://codereview.chromium.org/3747009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63016 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 9 deletions

diff --git a/chrome/browser/gtk/first_run_dialog.h b/chrome/browser/gtk/first_run_dialog.h
index 234a64b..fdd47a7 100644
--- a/chrome/browser/gtk/first_run_dialog.h
+++ b/chrome/browser/gtk/first_run_dialog.h
@@ -25,9 +25,8 @@ class FirstRunDialog : public TemplateURLModelObserver {
 
  private:
   FirstRunDialog(Profile* profile,
-                 bool show_reporting_dialog,
-                 bool show_search_engines_dialog,
-                 int* response);
+                 bool randomize_search_engine_order,
+                 int& response);
   virtual ~FirstRunDialog();
 
   CHROMEGTK_CALLBACK_1(FirstRunDialog, void, OnResponseDialog, int);
@@ -36,7 +35,7 @@ class FirstRunDialog : public TemplateURLModelObserver {
   CHROMEG_CALLBACK_0(FirstRunDialog, void, OnLearnMoreLinkClicked, GtkButton*);
 
   void ShowSearchEngineWindow();
-  void ShowReportingDialog();
+  void ShowDialog();
 
   // This method closes the first run window and quits the message loop so that
   // the Chrome startup can continue. This should be called when all the
@@ -69,12 +68,8 @@ class FirstRunDialog : public TemplateURLModelObserver {
   // search engine.
   TemplateURL* chosen_search_engine_;
 
-  // Whether we should show the dialog asking the user whether to report
-  // crashes and usage stats.
-  bool show_reporting_dialog_;
-
   // User response (accept or cancel) is returned through this.
-  int* response_;
+  int& response_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunDialog);
 };