| 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/common/login_status.h" | 7 #include "ash/common/login_status.h" |
| 8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
| 10 #include "ash/content/shell_content_state.h" | 10 #include "ash/content/shell_content_state.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 ShellContentState::SetInstance( | 127 ShellContentState::SetInstance( |
| 128 new ShellContentStateImpl(browser_context_.get())); | 128 new ShellContentStateImpl(browser_context_.get())); |
| 129 ui::MaterialDesignController::Initialize(); | 129 ui::MaterialDesignController::Initialize(); |
| 130 ash::ShellInitParams init_params; | 130 ash::ShellInitParams init_params; |
| 131 init_params.delegate = delegate_; | 131 init_params.delegate = delegate_; |
| 132 init_params.context_factory = content::GetContextFactory(); | 132 init_params.context_factory = content::GetContextFactory(); |
| 133 init_params.context_factory_private = content::GetContextFactoryPrivate(); | 133 init_params.context_factory_private = content::GetContextFactoryPrivate(); |
| 134 init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); | 134 init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); |
| 135 ash::Shell::CreateInstance(init_params); | 135 ash::Shell::CreateInstance(init_params); |
| 136 ash::WmShell::Get()->CreateShelf(); | 136 ash::WmShell::Get()->CreateShelfView(); |
| 137 ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER); | 137 ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER); |
| 138 | 138 |
| 139 window_watcher_.reset(new ash::shell::WindowWatcher); | 139 window_watcher_.reset(new ash::shell::WindowWatcher); |
| 140 display::Screen::GetScreen()->AddObserver(window_watcher_.get()); | 140 display::Screen::GetScreen()->AddObserver(window_watcher_.get()); |
| 141 | 141 |
| 142 ash::shell::InitWindowTypeLauncher(); | 142 ash::shell::InitWindowTypeLauncher(); |
| 143 | 143 |
| 144 // Initialize the example app list presenter. | 144 // Initialize the example app list presenter. |
| 145 example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>(); | 145 example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>(); |
| 146 WmShell::Get()->app_list()->SetAppListPresenter( | 146 WmShell::Get()->app_list()->SetAppListPresenter( |
| (...skipping 24 matching lines...) Expand all Loading... |
| 171 browser_context_.reset(); | 171 browser_context_.reset(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 175 base::RunLoop().Run(); | 175 base::RunLoop().Run(); |
| 176 return true; | 176 return true; |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace shell | 179 } // namespace shell |
| 180 } // namespace ash | 180 } // namespace ash |
| OLD | NEW |