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

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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 486
487 AppLaunchSplashScreenActor* 487 AppLaunchSplashScreenActor*
488 OobeUI::GetAppLaunchSplashScreenActor() { 488 OobeUI::GetAppLaunchSplashScreenActor() {
489 return app_launch_splash_screen_actor_; 489 return app_launch_splash_screen_actor_;
490 } 490 }
491 491
492 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { 492 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
493 // Note, handlers_[0] is a GenericHandler used by the WebUI. 493 // Note, handlers_[0] is a GenericHandler used by the WebUI.
494 for (size_t i = 0; i < handlers_.size(); ++i) 494 for (size_t i = 0; i < handlers_.size(); ++i)
495 handlers_[i]->GetLocalizedStrings(localized_strings); 495 handlers_[i]->GetLocalizedStrings(localized_strings);
496 webui::SetFontAndTextDirection(localized_strings); 496 webui::SetTextDirection(localized_strings);
497 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); 497 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings);
498 498
499 #if defined(GOOGLE_CHROME_BUILD) 499 #if defined(GOOGLE_CHROME_BUILD)
500 localized_strings->SetString("buildType", "chrome"); 500 localized_strings->SetString("buildType", "chrome");
501 #else 501 #else
502 localized_strings->SetString("buildType", "chromium"); 502 localized_strings->SetString("buildType", "chromium");
503 #endif 503 #endif
504 504
505 // If we're not doing boot animation then WebUI should trigger 505 // If we're not doing boot animation then WebUI should trigger
506 // wallpaper load on boot. 506 // wallpaper load on boot.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 DCHECK(screen_ids_.count(screen)) 637 DCHECK(screen_ids_.count(screen))
638 << "Screen should be registered in InitializeScreenMaps()"; 638 << "Screen should be registered in InitializeScreenMaps()";
639 Screen new_screen = screen_ids_[screen]; 639 Screen new_screen = screen_ids_[screen];
640 FOR_EACH_OBSERVER(Observer, 640 FOR_EACH_OBSERVER(Observer,
641 observer_list_, 641 observer_list_,
642 OnCurrentScreenChanged(current_screen_, new_screen)); 642 OnCurrentScreenChanged(current_screen_, new_screen));
643 current_screen_ = new_screen; 643 current_screen_ = new_screen;
644 } 644 }
645 645
646 } // namespace chromeos 646 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698