OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/first_run_customize_view.h" | 5 #include "chrome/browser/views/first_run_customize_view.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/win_util.h" | 9 #include "base/win_util.h" |
10 #include "chrome/browser/importer/importer.h" | 10 #include "chrome/browser/importer/importer.h" |
11 #include "chrome/browser/first_run.h" | 11 #include "chrome/browser/first_run.h" |
12 #include "chrome/browser/metrics/user_metrics.h" | 12 #include "chrome/browser/metrics/user_metrics.h" |
13 #include "chrome/installer/util/browser_distribution.h" | 13 #include "chrome/installer/util/browser_distribution.h" |
14 #include "grit/chromium_strings.h" | 14 #include "grit/chromium_strings.h" |
15 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
16 #include "grit/locale_settings.h" | 16 #include "grit/locale_settings.h" |
17 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
18 #include "views/controls/button/checkbox.h" | 18 #include "views/controls/button/checkbox.h" |
19 #include "views/controls/image_view.h" | 19 #include "views/controls/image_view.h" |
20 #include "views/controls/label.h" | 20 #include "views/controls/label.h" |
21 #include "views/controls/throbber.h" | 21 #include "views/controls/throbber.h" |
22 #include "views/standard_layout.h" | 22 #include "views/standard_layout.h" |
23 #include "views/window/window.h" | 23 #include "views/window/window.h" |
24 | 24 |
25 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, | 25 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, |
mattm
2010/06/16 00:20:26
I believe the first arg should also go on the next
Miranda Callahan
2010/06/16 15:30:00
Done.
| |
26 ImporterHost* importer_host, | 26 ImporterHost* importer_host, |
27 CustomizeViewObserver* observer, | 27 CustomizeViewObserver* observer, |
28 bool default_browser_checked, | 28 bool default_browser_checked, |
29 bool homepage_defined, | 29 bool homepage_defined, |
30 int import_items, | 30 int import_items, |
31 int dont_import_items, | 31 int dont_import_items, |
32 bool search_engine_experiment) | 32 bool search_engine_experiment, |
33 bool randomize_search_engine_experiment) | |
33 : FirstRunViewBase(profile, homepage_defined, import_items, | 34 : FirstRunViewBase(profile, homepage_defined, import_items, |
34 dont_import_items, search_engine_experiment), | 35 dont_import_items, search_engine_experiment, |
36 randomize_search_engine_experiment), | |
35 main_label_(NULL), | 37 main_label_(NULL), |
36 import_cbox_(NULL), | 38 import_cbox_(NULL), |
37 import_from_combo_(NULL), | 39 import_from_combo_(NULL), |
38 shortcuts_label_(NULL), | 40 shortcuts_label_(NULL), |
39 desktop_shortcut_cbox_(NULL), | 41 desktop_shortcut_cbox_(NULL), |
40 quick_shortcut_cbox_(NULL), | 42 quick_shortcut_cbox_(NULL), |
41 customize_observer_(observer) { | 43 customize_observer_(observer) { |
42 importer_host_ = importer_host; | 44 importer_host_ = importer_host; |
43 DCHECK(importer_host_); | 45 DCHECK(importer_host_); |
44 SetupControls(); | 46 SetupControls(); |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
235 | 237 |
236 bool FirstRunCustomizeView::Cancel() { | 238 bool FirstRunCustomizeView::Cancel() { |
237 if (customize_observer_) | 239 if (customize_observer_) |
238 customize_observer_->CustomizeCanceled(); | 240 customize_observer_->CustomizeCanceled(); |
239 | 241 |
240 // Don't quit the message loop in this case - we're still showing the main | 242 // Don't quit the message loop in this case - we're still showing the main |
241 // First run dialog box underneath ourselves. | 243 // First run dialog box underneath ourselves. |
242 | 244 |
243 return true; | 245 return true; |
244 } | 246 } |
OLD | NEW |