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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2721153004: Remove ash_util namespace (Closed)
Patch Set: Created 3 years, 9 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/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 247
248 /////////////////////////////////////////////////////////////////////////////// 248 ///////////////////////////////////////////////////////////////////////////////
249 // WizardController, public: 249 // WizardController, public:
250 250
251 PrefService* WizardController::local_state_for_testing_ = nullptr; 251 PrefService* WizardController::local_state_for_testing_ = nullptr;
252 252
253 WizardController::WizardController(LoginDisplayHost* host, OobeUI* oobe_ui) 253 WizardController::WizardController(LoginDisplayHost* host, OobeUI* oobe_ui)
254 : host_(host), oobe_ui_(oobe_ui), weak_factory_(this) { 254 : host_(host), oobe_ui_(oobe_ui), weak_factory_(this) {
255 DCHECK(default_controller_ == nullptr); 255 DCHECK(default_controller_ == nullptr);
256 default_controller_ = this; 256 default_controller_ = this;
257 if (!ash_util::IsRunningInMash()) { 257 if (!IsRunningInMash()) {
258 AccessibilityManager* accessibility_manager = AccessibilityManager::Get(); 258 AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
259 CHECK(accessibility_manager); 259 CHECK(accessibility_manager);
260 accessibility_subscription_ = accessibility_manager->RegisterCallback( 260 accessibility_subscription_ = accessibility_manager->RegisterCallback(
261 base::Bind(&WizardController::OnAccessibilityStatusChanged, 261 base::Bind(&WizardController::OnAccessibilityStatusChanged,
262 base::Unretained(this))); 262 base::Unretained(this)));
263 } else { 263 } else {
264 NOTIMPLEMENTED(); 264 NOTIMPLEMENTED();
265 } 265 }
266 } 266 }
267 267
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1493 } 1493 }
1494 1494
1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1496 screen->SetParameters(effective_config, shark_controller_.get()); 1496 screen->SetParameters(effective_config, shark_controller_.get());
1497 SetStatusAreaVisible(true); 1497 SetStatusAreaVisible(true);
1498 SetCurrentScreen(screen); 1498 SetCurrentScreen(screen);
1499 } 1499 }
1500 1500
1501 } // namespace chromeos 1501 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698