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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 1181703008: Removed webui_generator and new OOBE UI placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed empty line. Created 5 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.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 "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 const char kAccelNameKioskEnable[] = "kiosk_enable"; 62 const char kAccelNameKioskEnable[] = "kiosk_enable";
63 const char kAccelNameVersion[] = "version"; 63 const char kAccelNameVersion[] = "version";
64 const char kAccelNameReset[] = "reset"; 64 const char kAccelNameReset[] = "reset";
65 const char kAccelFocusPrev[] = "focus_prev"; 65 const char kAccelFocusPrev[] = "focus_prev";
66 const char kAccelFocusNext[] = "focus_next"; 66 const char kAccelFocusNext[] = "focus_next";
67 const char kAccelNameDeviceRequisition[] = "device_requisition"; 67 const char kAccelNameDeviceRequisition[] = "device_requisition";
68 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; 68 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
69 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; 69 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
70 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; 70 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
71 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; 71 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config";
72 const char kAccelNameNewOobe[] = "new_oobe";
73 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin"; 72 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin";
74 const char kAccelNameToggleNewLoginUI[] = "toggle_new_login_ui"; 73 const char kAccelNameToggleNewLoginUI[] = "toggle_new_login_ui";
75 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; 74 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap";
76 75
77 // A class to change arrow key traversal behavior when it's alive. 76 // A class to change arrow key traversal behavior when it's alive.
78 class ScopedArrowKeyTraversal { 77 class ScopedArrowKeyTraversal {
79 public: 78 public:
80 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) 79 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled)
81 : previous_arrow_key_traversal_enabled_( 80 : previous_arrow_key_traversal_enabled_(
82 views::FocusManager::arrow_key_traversal_enabled()) { 81 views::FocusManager::arrow_key_traversal_enabled()) {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 kAccelNameDeviceRequisitionShark; 173 kAccelNameDeviceRequisitionShark;
175 174
176 accel_map_[ui::Accelerator(ui::VKEY_S, 175 accel_map_[ui::Accelerator(ui::VKEY_S,
177 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 176 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
178 kAccelNameAppLaunchBailout; 177 kAccelNameAppLaunchBailout;
179 178
180 accel_map_[ui::Accelerator(ui::VKEY_N, 179 accel_map_[ui::Accelerator(ui::VKEY_N,
181 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 180 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
182 kAccelNameAppLaunchNetworkConfig; 181 kAccelNameAppLaunchNetworkConfig;
183 182
184 accel_map_[ui::Accelerator(
185 ui::VKEY_O, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN)] =
186 kAccelNameNewOobe;
187
188 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) 183 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
189 AddAccelerator(i->first); 184 AddAccelerator(i->first);
190 } 185 }
191 186
192 WebUILoginView::~WebUILoginView() { 187 WebUILoginView::~WebUILoginView() {
193 FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver, 188 FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
194 observer_list_, 189 observer_list_,
195 OnHostDestroying()); 190 OnHostDestroying());
196 191
197 if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) { 192 if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 webui_visible_ = true; 509 webui_visible_ = true;
515 } 510 }
516 511
517 void WebUILoginView::ReturnFocus(bool reverse) { 512 void WebUILoginView::ReturnFocus(bool reverse) {
518 // Return the focus to the web contents. 513 // Return the focus to the web contents.
519 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 514 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
520 GetWidget()->Activate(); 515 GetWidget()->Activate();
521 } 516 }
522 517
523 } // namespace chromeos 518 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/chromeos/oobe/oobe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698