Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 6312160: Map Views to Profiles directly from their window, eliminating the need... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 NotificationService::AllSources(), 125 NotificationService::AllSources(),
126 NotificationService::NoDetails()); 126 NotificationService::NoDetails());
127 } 127 }
128 128
129 bool AcceleratorPressed(const views::Accelerator& accel) { 129 bool AcceleratorPressed(const views::Accelerator& accel) {
130 WizardController* controller = WizardController::default_controller(); 130 WizardController* controller = WizardController::default_controller();
131 if (!controller) 131 if (!controller)
132 return false; 132 return false;
133 133
134 if (accel == accel_toggle_accessibility_) { 134 if (accel == accel_toggle_accessibility_) {
135 chromeos::WizardAccessibilityHelper::GetInstance()->ToggleAccessibility( 135 chromeos::WizardAccessibilityHelper::GetInstance()->ToggleAccessibility();
136 controller->contents()); } 136 } else if (accel == accel_cancel_update_) {
137 else if (accel == accel_cancel_update_) {
138 controller->CancelOOBEUpdate(); 137 controller->CancelOOBEUpdate();
139 #if !defined(OFFICIAL_BUILD) 138 #if !defined(OFFICIAL_BUILD)
140 } else if (accel == accel_account_screen_) { 139 } else if (accel == accel_account_screen_) {
141 controller->ShowAccountScreen(); 140 controller->ShowAccountScreen();
142 } else if (accel == accel_login_screen_) { 141 } else if (accel == accel_login_screen_) {
143 controller->ShowLoginScreen(); 142 controller->ShowLoginScreen();
144 } else if (accel == accel_network_screen_) { 143 } else if (accel == accel_network_screen_) {
145 controller->ShowNetworkScreen(); 144 controller->ShowNetworkScreen();
146 } else if (accel == accel_update_screen_) { 145 } else if (accel == accel_update_screen_) {
147 controller->ShowUpdateScreen(); 146 controller->ShowUpdateScreen();
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 // user has changed to during OOBE. 1033 // user has changed to during OOBE.
1035 if (!timezone_name.empty()) { 1034 if (!timezone_name.empty()) {
1036 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 1035 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
1037 icu::UnicodeString::fromUTF8(timezone_name)); 1036 icu::UnicodeString::fromUTF8(timezone_name));
1038 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 1037 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
1039 } 1038 }
1040 } 1039 }
1041 } 1040 }
1042 1041
1043 } // namespace browser 1042 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.cc ('k') | chrome/browser/ui/views/about_chrome_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698