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

Side by Side Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete 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
« no previous file with comments | « ash/shell/app_list.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/login_status.h" 7 #include "ash/common/login_status.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "ash/content/shell_content_state.h" 9 #include "ash/content/shell_content_state.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ash::WmShell::Get()->CreateShelfView(); 134 ash::WmShell::Get()->CreateShelfView();
135 ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER); 135 ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
136 136
137 window_watcher_.reset(new ash::shell::WindowWatcher); 137 window_watcher_.reset(new ash::shell::WindowWatcher);
138 display::Screen::GetScreen()->AddObserver(window_watcher_.get()); 138 display::Screen::GetScreen()->AddObserver(window_watcher_.get());
139 139
140 ash::shell::InitWindowTypeLauncher(); 140 ash::shell::InitWindowTypeLauncher();
141 141
142 // Initialize the example app list presenter. 142 // Initialize the example app list presenter.
143 example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>(); 143 example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>();
144 WmShell::Get()->app_list()->SetAppListPresenter( 144 Shell::Get()->app_list()->SetAppListPresenter(
145 example_app_list_presenter_->CreateInterfacePtrAndBind()); 145 example_app_list_presenter_->CreateInterfacePtrAndBind());
146 146
147 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); 147 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
148 } 148 }
149 149
150 void ShellBrowserMainParts::PostMainMessageLoopRun() { 150 void ShellBrowserMainParts::PostMainMessageLoopRun() {
151 display::Screen::GetScreen()->RemoveObserver(window_watcher_.get()); 151 display::Screen::GetScreen()->RemoveObserver(window_watcher_.get());
152 152
153 window_watcher_.reset(); 153 window_watcher_.reset();
154 delegate_ = nullptr; 154 delegate_ = nullptr;
(...skipping 14 matching lines...) Expand all
169 browser_context_.reset(); 169 browser_context_.reset();
170 } 170 }
171 171
172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
173 base::RunLoop().Run(); 173 base::RunLoop().Run();
174 return true; 174 return true;
175 } 175 }
176 176
177 } // namespace shell 177 } // namespace shell
178 } // namespace ash 178 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/app_list.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698