OLD | NEW |
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 message_center::MessageCenter::Initialize(); | 112 message_center::MessageCenter::Initialize(); |
113 | 113 |
114 #if defined(OS_CHROMEOS) | 114 #if defined(OS_CHROMEOS) |
115 // Create CrasAudioHandler for testing since g_browser_process | 115 // Create CrasAudioHandler for testing since g_browser_process |
116 // is absent. | 116 // is absent. |
117 chromeos::CrasAudioHandler::InitializeForTesting(); | 117 chromeos::CrasAudioHandler::InitializeForTesting(); |
118 #endif | 118 #endif |
119 | 119 |
120 ash::Shell::CreateInstance(delegate_); | 120 ash::Shell::CreateInstance(delegate_); |
121 delegate_->set_browser_context(browser_context_.get()); | 121 delegate_->set_browser_context(browser_context_.get()); |
122 ash::Shell::GetInstance()->CreateLauncher(); | 122 ash::Shell::GetInstance()->CreateShelf(); |
123 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( | 123 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( |
124 user::LOGGED_IN_USER); | 124 user::LOGGED_IN_USER); |
125 | 125 |
126 window_watcher_.reset(new ash::shell::WindowWatcher); | 126 window_watcher_.reset(new ash::shell::WindowWatcher); |
127 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); | 127 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); |
128 screen->AddObserver(window_watcher_.get()); | 128 screen->AddObserver(window_watcher_.get()); |
129 delegate_->SetWatcher(window_watcher_.get()); | 129 delegate_->SetWatcher(window_watcher_.get()); |
130 | 130 |
131 ash::shell::InitWindowTypeLauncher(); | 131 ash::shell::InitWindowTypeLauncher(); |
132 | 132 |
(...skipping 28 matching lines...) Expand all Loading... |
161 browser_context_.reset(); | 161 browser_context_.reset(); |
162 } | 162 } |
163 | 163 |
164 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 164 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
165 base::MessageLoopForUI::current()->Run(); | 165 base::MessageLoopForUI::current()->Run(); |
166 return true; | 166 return true; |
167 } | 167 } |
168 | 168 |
169 } // namespace shell | 169 } // namespace shell |
170 } // namespace ash | 170 } // namespace ash |
OLD | NEW |