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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // Initialize user policy before creating the profile so the profile 315 // Initialize user policy before creating the profile so the profile
316 // initialization code sees policy settings. 316 // initialization code sees policy settings.
317 g_browser_process->browser_policy_connector()->InitializeUserPolicy( 317 g_browser_process->browser_policy_connector()->InitializeUserPolicy(
318 username, false /* wait_for_policy_fetch */); 318 username, false /* wait_for_policy_fetch */);
319 } else if (parsed_command_line().HasSwitch(switches::kLoginManager)) { 319 } else if (parsed_command_line().HasSwitch(switches::kLoginManager)) {
320 // Initialize status area mode early on. 320 // Initialize status area mode early on.
321 chromeos::StatusAreaViewChromeos:: 321 chromeos::StatusAreaViewChromeos::
322 SetScreenMode(chromeos::StatusAreaViewChromeos::LOGIN_MODE_WEBUI); 322 SetScreenMode(chromeos::StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
323 } 323 }
324 324
325 // In Aura builds this will initialize aura_shell::Shell. 325 // In Aura builds this will initialize ash::Shell.
326 ChromeBrowserMainPartsLinux::PreProfileInit(); 326 ChromeBrowserMainPartsLinux::PreProfileInit();
327 } 327 }
328 328
329 void ChromeBrowserMainPartsChromeos::PostProfileInit() { 329 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
330 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 330 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
331 // -- just after CreateProfile(). 331 // -- just after CreateProfile().
332 332
333 // Pass the TokenService pointer to the policy connector so user policy can 333 // Pass the TokenService pointer to the policy connector so user policy can
334 // grab a token and register with the policy server. 334 // grab a token and register with the policy server.
335 // TODO(mnissler): Remove once OAuth is the only authentication mechanism. 335 // TODO(mnissler): Remove once OAuth is the only authentication mechanism.
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 // Singletons are finally destroyed in AtExitManager. 491 // Singletons are finally destroyed in AtExitManager.
492 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 492 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
493 493
494 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 494 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
495 // even if Initialize() wasn't called. 495 // even if Initialize() wasn't called.
496 chromeos::SystemKeyEventListener::Shutdown(); 496 chromeos::SystemKeyEventListener::Shutdown();
497 chromeos::AudioHandler::Shutdown(); 497 chromeos::AudioHandler::Shutdown();
498 498
499 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); 499 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
500 } 500 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698