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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShelfTestAPI Created 7 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) 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 "ash/shell/content_client/shell_browser_main_parts.h" 5 #include "ash/shell/content_client/shell_browser_main_parts.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell/shell_delegate_impl.h" 10 #include "ash/shell/shell_delegate_impl.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 message_center::MessageCenter::Initialize(); 113 message_center::MessageCenter::Initialize();
114 114
115 #if defined(OS_CHROMEOS) 115 #if defined(OS_CHROMEOS)
116 // Create CrasAudioHandler for testing since g_browser_process 116 // Create CrasAudioHandler for testing since g_browser_process
117 // is absent. 117 // is absent.
118 chromeos::CrasAudioHandler::InitializeForTesting(); 118 chromeos::CrasAudioHandler::InitializeForTesting();
119 #endif 119 #endif
120 120
121 ash::Shell::CreateInstance(delegate_); 121 ash::Shell::CreateInstance(delegate_);
122 delegate_->set_browser_context(browser_context_.get()); 122 delegate_->set_browser_context(browser_context_.get());
123 ash::Shell::GetInstance()->CreateLauncher(); 123 ash::Shell::GetInstance()->CreateShelf();
124 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( 124 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
125 user::LOGGED_IN_USER); 125 user::LOGGED_IN_USER);
126 126
127 window_watcher_.reset(new ash::shell::WindowWatcher); 127 window_watcher_.reset(new ash::shell::WindowWatcher);
128 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); 128 gfx::Screen* screen = Shell::GetInstance()->GetScreen();
129 screen->AddObserver(window_watcher_.get()); 129 screen->AddObserver(window_watcher_.get());
130 delegate_->SetWatcher(window_watcher_.get()); 130 delegate_->SetWatcher(window_watcher_.get());
131 131
132 ash::shell::InitWindowTypeLauncher(); 132 ash::shell::InitWindowTypeLauncher();
133 133
(...skipping 28 matching lines...) Expand all
162 browser_context_.reset(); 162 browser_context_.reset();
163 } 163 }
164 164
165 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 165 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
166 base::MessageLoopForUI::current()->Run(); 166 base::MessageLoopForUI::current()->Run();
167 return true; 167 return true;
168 } 168 }
169 169
170 } // namespace shell 170 } // namespace shell
171 } // namespace ash 171 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698