| Index: chrome/browser/ui/gtk/first_run_dialog.h
|
| diff --git a/chrome/browser/ui/gtk/first_run_dialog.h b/chrome/browser/ui/gtk/first_run_dialog.h
|
| index 67b8e6d56f92489e93736e8d19fd79e3c0cb7b94..684dd293ea6ffcac7a11fea630cda6ac118e5dca 100644
|
| --- a/chrome/browser/ui/gtk/first_run_dialog.h
|
| +++ b/chrome/browser/ui/gtk/first_run_dialog.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -11,32 +11,20 @@ typedef struct _GtkWidget GtkWidget;
|
|
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/first_run/first_run.h"
|
| -#include "chrome/browser/search_engines/template_url_service_observer.h"
|
| #include "ui/base/gtk/gtk_signal.h"
|
|
|
| -class TemplateURL;
|
| -class TemplateURLService;
|
| -
|
| -class FirstRunDialog : public TemplateURLServiceObserver {
|
| +class FirstRunDialog {
|
| public:
|
| // Displays the first run UI for reporting opt-in, import data etc.
|
| - static bool Show(Profile* profile, bool randomize_search_engine_order);
|
| -
|
| - virtual void OnTemplateURLServiceChanged() OVERRIDE;
|
| + static bool Show();
|
|
|
| private:
|
| - FirstRunDialog(Profile* profile,
|
| - bool show_reporting_dialog,
|
| - bool show_search_engines_dialog,
|
| - int* response);
|
| + FirstRunDialog(bool show_reporting_dialog, int* response);
|
| virtual ~FirstRunDialog();
|
|
|
| CHROMEGTK_CALLBACK_1(FirstRunDialog, void, OnResponseDialog, int);
|
| - CHROMEGTK_CALLBACK_0(FirstRunDialog, void, OnSearchEngineButtonClicked);
|
| - CHROMEGTK_CALLBACK_0(FirstRunDialog, void, OnSearchEngineWindowDestroy);
|
| CHROMEG_CALLBACK_0(FirstRunDialog, void, OnLearnMoreLinkClicked, GtkButton*);
|
|
|
| - void ShowSearchEngineWindow();
|
| void ShowReportingDialog();
|
|
|
| // This method closes the first run window and quits the message loop so that
|
| @@ -44,32 +32,15 @@ class FirstRunDialog : public TemplateURLServiceObserver {
|
| // first run tasks are done.
|
| void FirstRunDone();
|
|
|
| - // The search engine choice window. This is created and shown before
|
| - // |dialog_|.
|
| - GtkWidget* search_engine_window_;
|
| -
|
| // Dialog that holds the bug reporting and default browser checkboxes.
|
| GtkWidget* dialog_;
|
|
|
| - // Container for the search engine choices.
|
| - GtkWidget* search_engine_hbox_;
|
| -
|
| // Crash reporting checkbox
|
| GtkWidget* report_crashes_;
|
|
|
| // Make browser default checkbox
|
| GtkWidget* make_default_;
|
|
|
| - // Our current profile
|
| - Profile* profile_;
|
| -
|
| - // Owned by the profile_.
|
| - TemplateURLService* search_engines_model_;
|
| -
|
| - // The search engine the user chose, or NULL if the user has not chosen a
|
| - // 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_;
|
|
|