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

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

Issue 301923002: Revert of Follow up change for disabling out-of-box VK overscroll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 } 302 }
303 303
304 void OobeUI::ShowScreen(WizardScreen* screen) { 304 void OobeUI::ShowScreen(WizardScreen* screen) {
305 screen->Show(); 305 screen->Show();
306 } 306 }
307 307
308 void OobeUI::HideScreen(WizardScreen* screen) { 308 void OobeUI::HideScreen(WizardScreen* screen) {
309 screen->Hide(); 309 screen->Hide();
310 } 310 }
311 311
312 CoreOobeActor* OobeUI::GetCoreOobeActor() {
313 return core_handler_;
314 }
315
316 UpdateScreenActor* OobeUI::GetUpdateScreenActor() { 312 UpdateScreenActor* OobeUI::GetUpdateScreenActor() {
317 return update_screen_handler_; 313 return update_screen_handler_;
318 } 314 }
319 315
320 NetworkScreenActor* OobeUI::GetNetworkScreenActor() { 316 NetworkScreenActor* OobeUI::GetNetworkScreenActor() {
321 return network_screen_actor_; 317 return network_screen_actor_;
322 } 318 }
323 319
324 EulaScreenActor* OobeUI::GetEulaScreenActor() { 320 EulaScreenActor* OobeUI::GetEulaScreenActor() {
325 return eula_screen_actor_; 321 return eula_screen_actor_;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 observer_list_, 506 observer_list_,
511 OnCurrentScreenChanged(current_screen_, new_screen)); 507 OnCurrentScreenChanged(current_screen_, new_screen));
512 current_screen_ = new_screen; 508 current_screen_ = new_screen;
513 } else { 509 } else {
514 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 510 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
515 current_screen_ = SCREEN_UNKNOWN; 511 current_screen_ = SCREEN_UNKNOWN;
516 } 512 }
517 } 513 }
518 514
519 } // namespace chromeos 515 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698