OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/locale_change_guard.h" | 5 #include "chrome/browser/chromeos/locale_change_guard.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
9 #include "ash/system/tray/system_tray_notifier.h" | 9 #include "ash/system/tray/system_tray_notifier.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 } | 83 } |
84 if (reverted_) | 84 if (reverted_) |
85 return; | 85 return; |
86 reverted_ = true; | 86 reverted_ = true; |
87 content::RecordAction(UserMetricsAction("LanguageChange_Revert")); | 87 content::RecordAction(UserMetricsAction("LanguageChange_Revert")); |
88 profile_->ChangeAppLocale( | 88 profile_->ChangeAppLocale( |
89 from_locale_, Profile::APP_LOCALE_CHANGED_VIA_REVERT); | 89 from_locale_, Profile::APP_LOCALE_CHANGED_VIA_REVERT); |
90 chrome::AttemptUserExit(); | 90 chrome::AttemptUserExit(); |
91 } | 91 } |
92 | 92 |
93 void LocaleChangeGuard::RevertLocaleChangeCallback(const ListValue* list) { | 93 void LocaleChangeGuard::RevertLocaleChangeCallback( |
| 94 const base::ListValue* list) { |
94 RevertLocaleChange(); | 95 RevertLocaleChange(); |
95 } | 96 } |
96 | 97 |
97 void LocaleChangeGuard::Observe(int type, | 98 void LocaleChangeGuard::Observe(int type, |
98 const content::NotificationSource& source, | 99 const content::NotificationSource& source, |
99 const content::NotificationDetails& details) { | 100 const content::NotificationDetails& details) { |
100 if (profile_ == NULL) { | 101 if (profile_ == NULL) { |
101 NOTREACHED(); | 102 NOTREACHED(); |
102 return; | 103 return; |
103 } | 104 } |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 if (by_user) | 238 if (by_user) |
238 master_->AcceptLocaleChange(); | 239 master_->AcceptLocaleChange(); |
239 } | 240 } |
240 | 241 |
241 std::string LocaleChangeGuard::Delegate::id() const { | 242 std::string LocaleChangeGuard::Delegate::id() const { |
242 // Arbitrary unique Id. | 243 // Arbitrary unique Id. |
243 return "8c386938-1e3f-11e0-ac7b-18a90520e2e5"; | 244 return "8c386938-1e3f-11e0-ac7b-18a90520e2e5"; |
244 } | 245 } |
245 | 246 |
246 } // namespace chromeos | 247 } // namespace chromeos |
OLD | NEW |