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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/enrollment_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
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/enrollment_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/common/system/chromeos/devicetype_utils.h" 9 #include "ash/common/system/chromeos/devicetype_utils.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 ERROR_STATE_BAD_PASSWORD = 4, 116 ERROR_STATE_BAD_PASSWORD = 4,
117 }; 117 };
118 118
119 } // namespace 119 } // namespace
120 120
121 // EnrollmentScreenHandler, public ------------------------------ 121 // EnrollmentScreenHandler, public ------------------------------
122 122
123 EnrollmentScreenHandler::EnrollmentScreenHandler( 123 EnrollmentScreenHandler::EnrollmentScreenHandler(
124 const scoped_refptr<NetworkStateInformer>& network_state_informer, 124 const scoped_refptr<NetworkStateInformer>& network_state_informer,
125 ErrorScreen* error_screen) 125 ErrorScreen* error_screen)
126 : BaseScreenHandler(kJsScreenPath), 126 : network_state_informer_(network_state_informer),
127 network_state_informer_(network_state_informer),
128 error_screen_(error_screen), 127 error_screen_(error_screen),
129 histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")), 128 histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
130 weak_ptr_factory_(this) { 129 weak_ptr_factory_(this) {
130 set_call_js_prefix(kJsScreenPath);
131 set_async_assets_load_id( 131 set_async_assets_load_id(
132 GetOobeScreenName(OobeScreen::SCREEN_OOBE_ENROLLMENT)); 132 GetOobeScreenName(OobeScreen::SCREEN_OOBE_ENROLLMENT));
133 DCHECK(network_state_informer_.get()); 133 DCHECK(network_state_informer_.get());
134 DCHECK(error_screen_); 134 DCHECK(error_screen_);
135 network_state_informer_->AddObserver(this); 135 network_state_informer_->AddObserver(this);
136 } 136 }
137 137
138 EnrollmentScreenHandler::~EnrollmentScreenHandler() { 138 EnrollmentScreenHandler::~EnrollmentScreenHandler() {
139 network_state_informer_->RemoveObserver(this); 139 network_state_informer_->RemoveObserver(this);
140 } 140 }
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 694
695 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data); 695 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data);
696 if (first_show_) { 696 if (first_show_) {
697 first_show_ = false; 697 first_show_ = false;
698 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true); 698 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true);
699 } 699 }
700 histogram_helper_->OnScreenShow(); 700 histogram_helper_->OnScreenShow();
701 } 701 }
702 702
703 } // namespace chromeos 703 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698