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

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

Issue 2701023003: cros: Move call js prefix out of ctor. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_launch_splash_screen_handle r.h" 5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
6 6
7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
8 #include "chrome/browser/chromeos/login/oobe_screen.h" 8 #include "chrome/browser/chromeos/login/oobe_screen.h"
9 #include "chrome/browser/chromeos/login/screens/network_error.h" 9 #include "chrome/browser/chromeos/login/screens/network_error.h"
10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
(...skipping 21 matching lines...) Expand all
32 return network->name(); 32 return network->name();
33 } 33 }
34 34
35 } // namespace 35 } // namespace
36 36
37 namespace chromeos { 37 namespace chromeos {
38 38
39 AppLaunchSplashScreenHandler::AppLaunchSplashScreenHandler( 39 AppLaunchSplashScreenHandler::AppLaunchSplashScreenHandler(
40 const scoped_refptr<NetworkStateInformer>& network_state_informer, 40 const scoped_refptr<NetworkStateInformer>& network_state_informer,
41 ErrorScreen* error_screen) 41 ErrorScreen* error_screen)
42 : BaseScreenHandler(kJsScreenPath), 42 : network_state_informer_(network_state_informer),
43 network_state_informer_(network_state_informer),
44 error_screen_(error_screen) { 43 error_screen_(error_screen) {
44 set_call_js_prefix(kJsScreenPath);
45 network_state_informer_->AddObserver(this); 45 network_state_informer_->AddObserver(this);
46 } 46 }
47 47
48 AppLaunchSplashScreenHandler::~AppLaunchSplashScreenHandler() { 48 AppLaunchSplashScreenHandler::~AppLaunchSplashScreenHandler() {
49 network_state_informer_->RemoveObserver(this); 49 network_state_informer_->RemoveObserver(this);
50 } 50 }
51 51
52 void AppLaunchSplashScreenHandler::DeclareLocalizedValues( 52 void AppLaunchSplashScreenHandler::DeclareLocalizedValues(
53 ::login::LocalizedValuesBuilder* builder) { 53 ::login::LocalizedValuesBuilder* builder) {
54 builder->Add("appStartMessage", IDS_APP_START_NETWORK_WAIT_MESSAGE); 54 builder->Add("appStartMessage", IDS_APP_START_NETWORK_WAIT_MESSAGE);
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 DCHECK(online_state_); 272 DCHECK(online_state_);
273 if (delegate_ && online_state_) { 273 if (delegate_ && online_state_) {
274 network_config_requested_ = false; 274 network_config_requested_ = false;
275 network_config_done_ = true; 275 network_config_done_ = true;
276 delegate_->OnNetworkConfigRequested(false); 276 delegate_->OnNetworkConfigRequested(false);
277 Show(app_id_); 277 Show(app_id_);
278 } 278 }
279 } 279 }
280 280
281 } // namespace chromeos 281 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698