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

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

Issue 158833003: Represent kiosk apps as user pods instead of menu items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review + fixes Created 6 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) 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 switches::kDisableBootAnimation)) { 371 switches::kDisableBootAnimation)) {
372 localized_strings->SetString("bootIntoWallpaper", "on"); 372 localized_strings->SetString("bootIntoWallpaper", "on");
373 } else { 373 } else {
374 localized_strings->SetString("bootIntoWallpaper", "off"); 374 localized_strings->SetString("bootIntoWallpaper", "off");
375 } 375 }
376 376
377 bool keyboard_driven_oobe = 377 bool keyboard_driven_oobe =
378 system::keyboard_settings::ForceKeyboardDrivenUINavigation(); 378 system::keyboard_settings::ForceKeyboardDrivenUINavigation();
379 localized_strings->SetString("highlightStrength", 379 localized_strings->SetString("highlightStrength",
380 keyboard_driven_oobe ? "strong" : "normal"); 380 keyboard_driven_oobe ? "strong" : "normal");
381
382 bool new_kiosk_ui = !CommandLine::ForCurrentProcess()->
383 HasSwitch(switches::kDisableNewKioskUI);
384 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
381 } 385 }
382 386
383 void OobeUI::InitializeScreenMaps() { 387 void OobeUI::InitializeScreenMaps() {
384 screen_names_.resize(SCREEN_UNKNOWN); 388 screen_names_.resize(SCREEN_UNKNOWN);
385 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork; 389 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork;
386 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula; 390 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula;
387 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate; 391 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
388 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment; 392 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
389 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin; 393 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
390 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker; 394 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 observer_list_, 489 observer_list_,
486 OnCurrentScreenChanged(current_screen_, new_screen)); 490 OnCurrentScreenChanged(current_screen_, new_screen));
487 current_screen_ = new_screen; 491 current_screen_ = new_screen;
488 } else { 492 } else {
489 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 493 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
490 current_screen_ = SCREEN_UNKNOWN; 494 current_screen_ = SCREEN_UNKNOWN;
491 } 495 }
492 } 496 }
493 497
494 } // namespace chromeos 498 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698