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

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

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 (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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); 484 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings);
485 485
486 #if defined(GOOGLE_CHROME_BUILD) 486 #if defined(GOOGLE_CHROME_BUILD)
487 localized_strings->SetString("buildType", "chrome"); 487 localized_strings->SetString("buildType", "chrome");
488 #else 488 #else
489 localized_strings->SetString("buildType", "chromium"); 489 localized_strings->SetString("buildType", "chromium");
490 #endif 490 #endif
491 491
492 // If we're not doing boot animation then WebUI should trigger 492 // If we're not doing boot animation then WebUI should trigger
493 // wallpaper load on boot. 493 // wallpaper load on boot.
494 if (CommandLine::ForCurrentProcess()->HasSwitch( 494 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
495 switches::kDisableBootAnimation)) { 495 switches::kDisableBootAnimation)) {
496 localized_strings->SetString("bootIntoWallpaper", "on"); 496 localized_strings->SetString("bootIntoWallpaper", "on");
497 } else { 497 } else {
498 localized_strings->SetString("bootIntoWallpaper", "off"); 498 localized_strings->SetString("bootIntoWallpaper", "off");
499 } 499 }
500 500
501 bool keyboard_driven_oobe = 501 bool keyboard_driven_oobe =
502 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 502 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
503 localized_strings->SetString("highlightStrength", 503 localized_strings->SetString("highlightStrength",
504 keyboard_driven_oobe ? "strong" : "normal"); 504 keyboard_driven_oobe ? "strong" : "normal");
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 DCHECK(screen_ids_.count(screen)) 624 DCHECK(screen_ids_.count(screen))
625 << "Screen should be registered in InitializeScreenMaps()"; 625 << "Screen should be registered in InitializeScreenMaps()";
626 Screen new_screen = screen_ids_[screen]; 626 Screen new_screen = screen_ids_[screen];
627 FOR_EACH_OBSERVER(Observer, 627 FOR_EACH_OBSERVER(Observer,
628 observer_list_, 628 observer_list_,
629 OnCurrentScreenChanged(current_screen_, new_screen)); 629 OnCurrentScreenChanged(current_screen_, new_screen));
630 current_screen_ = new_screen; 630 current_screen_ = new_screen;
631 } 631 }
632 632
633 } // namespace chromeos 633 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698