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

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

Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: review Created 5 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
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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 482
483 AppLaunchSplashScreenActor* 483 AppLaunchSplashScreenActor*
484 OobeUI::GetAppLaunchSplashScreenActor() { 484 OobeUI::GetAppLaunchSplashScreenActor() {
485 return app_launch_splash_screen_actor_; 485 return app_launch_splash_screen_actor_;
486 } 486 }
487 487
488 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { 488 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
489 // Note, handlers_[0] is a GenericHandler used by the WebUI. 489 // Note, handlers_[0] is a GenericHandler used by the WebUI.
490 for (size_t i = 0; i < handlers_.size(); ++i) 490 for (size_t i = 0; i < handlers_.size(); ++i)
491 handlers_[i]->GetLocalizedStrings(localized_strings); 491 handlers_[i]->GetLocalizedStrings(localized_strings);
492 webui::SetFontAndTextDirection(localized_strings); 492 webui::SetTextDirection(localized_strings);
493 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); 493 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings);
494 494
495 #if defined(GOOGLE_CHROME_BUILD) 495 #if defined(GOOGLE_CHROME_BUILD)
496 localized_strings->SetString("buildType", "chrome"); 496 localized_strings->SetString("buildType", "chrome");
497 #else 497 #else
498 localized_strings->SetString("buildType", "chromium"); 498 localized_strings->SetString("buildType", "chromium");
499 #endif 499 #endif
500 500
501 // If we're not doing boot animation then WebUI should trigger 501 // If we're not doing boot animation then WebUI should trigger
502 // wallpaper load on boot. 502 // wallpaper load on boot.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 DCHECK(screen_ids_.count(screen)) 633 DCHECK(screen_ids_.count(screen))
634 << "Screen should be registered in InitializeScreenMaps()"; 634 << "Screen should be registered in InitializeScreenMaps()";
635 Screen new_screen = screen_ids_[screen]; 635 Screen new_screen = screen_ids_[screen];
636 FOR_EACH_OBSERVER(Observer, 636 FOR_EACH_OBSERVER(Observer,
637 observer_list_, 637 observer_list_,
638 OnCurrentScreenChanged(current_screen_, new_screen)); 638 OnCurrentScreenChanged(current_screen_, new_screen));
639 current_screen_ = new_screen; 639 current_screen_ = new_screen;
640 } 640 }
641 641
642 } // namespace chromeos 642 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698