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

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

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 const int kWaitForRebootTimeSec = 3; 76 const int kWaitForRebootTimeSec = 3;
77 77
78 // RootView of the Widget WizardController creates. Contains the contents of the 78 // RootView of the Widget WizardController creates. Contains the contents of the
79 // WizardController. 79 // WizardController.
80 class ContentView : public views::View { 80 class ContentView : public views::View {
81 public: 81 public:
82 ContentView() 82 ContentView()
83 : accel_toggle_accessibility_( 83 : accel_toggle_accessibility_(
84 chromeos::WizardAccessibilityHelper::GetAccelerator()) { 84 chromeos::WizardAccessibilityHelper::GetAccelerator()) {
85 #if defined(OFFICIAL_BUILD) 85 #if defined(OFFICIAL_BUILD)
86 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE, 86 accel_cancel_update_ = views::Accelerator(ui::VKEY_ESCAPE,
87 true, true, true); 87 true, true, true);
88 #else 88 #else
89 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE, 89 accel_cancel_update_ = views::Accelerator(ui::VKEY_ESCAPE,
90 false, false, false); 90 false, false, false);
91 accel_account_screen_ = views::Accelerator(app::VKEY_A, 91 accel_account_screen_ = views::Accelerator(ui::VKEY_A,
92 false, true, true); 92 false, true, true);
93 accel_login_screen_ = views::Accelerator(app::VKEY_L, 93 accel_login_screen_ = views::Accelerator(ui::VKEY_L,
94 false, true, true); 94 false, true, true);
95 accel_network_screen_ = views::Accelerator(app::VKEY_N, 95 accel_network_screen_ = views::Accelerator(ui::VKEY_N,
96 false, true, true); 96 false, true, true);
97 accel_update_screen_ = views::Accelerator(app::VKEY_U, 97 accel_update_screen_ = views::Accelerator(ui::VKEY_U,
98 false, true, true); 98 false, true, true);
99 accel_image_screen_ = views::Accelerator(app::VKEY_I, 99 accel_image_screen_ = views::Accelerator(ui::VKEY_I,
100 false, true, true); 100 false, true, true);
101 accel_eula_screen_ = views::Accelerator(app::VKEY_E, 101 accel_eula_screen_ = views::Accelerator(ui::VKEY_E,
102 false, true, true); 102 false, true, true);
103 accel_register_screen_ = views::Accelerator(app::VKEY_R, 103 accel_register_screen_ = views::Accelerator(ui::VKEY_R,
104 false, true, true); 104 false, true, true);
105 AddAccelerator(accel_account_screen_); 105 AddAccelerator(accel_account_screen_);
106 AddAccelerator(accel_login_screen_); 106 AddAccelerator(accel_login_screen_);
107 AddAccelerator(accel_network_screen_); 107 AddAccelerator(accel_network_screen_);
108 AddAccelerator(accel_update_screen_); 108 AddAccelerator(accel_update_screen_);
109 AddAccelerator(accel_image_screen_); 109 AddAccelerator(accel_image_screen_);
110 AddAccelerator(accel_eula_screen_); 110 AddAccelerator(accel_eula_screen_);
111 AddAccelerator(accel_register_screen_); 111 AddAccelerator(accel_register_screen_);
112 #endif 112 #endif
113 AddAccelerator(accel_toggle_accessibility_); 113 AddAccelerator(accel_toggle_accessibility_);
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 // user has changed to during OOBE. 1035 // user has changed to during OOBE.
1036 if (!timezone_name.empty()) { 1036 if (!timezone_name.empty()) {
1037 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 1037 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
1038 icu::UnicodeString::fromUTF8(timezone_name)); 1038 icu::UnicodeString::fromUTF8(timezone_name));
1039 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 1039 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
1040 } 1040 }
1041 } 1041 }
1042 } 1042 }
1043 1043
1044 } // namespace browser 1044 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698