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/instant_confirm_view.h" | 5 #include "chrome/browser/views/instant_confirm_view.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "chrome/browser/browser.h" | 8 #include "chrome/browser/browser.h" |
9 #include "chrome/browser/browser_list.h" | 9 #include "chrome/browser/browser_list.h" |
10 #include "chrome/browser/instant/instant_confirm_dialog.h" | 10 #include "chrome/browser/instant/instant_confirm_dialog.h" |
| 11 #include "chrome/browser/instant/instant_controller.h" |
11 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
12 #include "chrome/browser/profile.h" | 13 #include "chrome/browser/profile.h" |
13 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
14 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
15 #include "grit/locale_settings.h" | 16 #include "grit/locale_settings.h" |
16 #include "views/controls/label.h" | 17 #include "views/controls/label.h" |
17 #include "views/grid_layout.h" | 18 #include "views/grid_layout.h" |
18 #include "views/layout_manager.h" | 19 #include "views/layout_manager.h" |
19 #include "views/standard_layout.h" | 20 #include "views/standard_layout.h" |
20 #include "views/window/window.h" | 21 #include "views/window/window.h" |
(...skipping 20 matching lines...) Expand all Loading... |
41 layout->AddView(description_label); | 42 layout->AddView(description_label); |
42 layout->StartRow(0, first_column_set); | 43 layout->StartRow(0, first_column_set); |
43 layout->AddView(learn_more_link); | 44 layout->AddView(learn_more_link); |
44 } | 45 } |
45 | 46 |
46 bool InstantConfirmView::Accept(bool window_closing) { | 47 bool InstantConfirmView::Accept(bool window_closing) { |
47 return Accept(); | 48 return Accept(); |
48 } | 49 } |
49 | 50 |
50 bool InstantConfirmView::Accept() { | 51 bool InstantConfirmView::Accept() { |
51 PrefService* prefs = profile_->GetPrefs(); | 52 InstantController::Enable(profile_); |
52 if (prefs) { | |
53 prefs->SetBoolean(prefs::kInstantEnabled, true); | |
54 prefs->SetBoolean(prefs::kInstantConfirmDialogShown, true); | |
55 } | |
56 return true; | 53 return true; |
57 } | 54 } |
58 | 55 |
59 bool InstantConfirmView::Cancel() { | 56 bool InstantConfirmView::Cancel() { |
60 return true; | 57 return true; |
61 } | 58 } |
62 | 59 |
63 views::View* InstantConfirmView::GetContentsView() { | 60 views::View* InstantConfirmView::GetContentsView() { |
64 return this; | 61 return this; |
65 } | 62 } |
(...skipping 22 matching lines...) Expand all Loading... |
88 } | 85 } |
89 | 86 |
90 namespace browser { | 87 namespace browser { |
91 | 88 |
92 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { | 89 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { |
93 views::Window::CreateChromeWindow(parent, gfx::Rect(), | 90 views::Window::CreateChromeWindow(parent, gfx::Rect(), |
94 new InstantConfirmView(profile))->Show(); | 91 new InstantConfirmView(profile))->Show(); |
95 } | 92 } |
96 | 93 |
97 } // namespace browser | 94 } // namespace browser |
OLD | NEW |