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

Side by Side Diff: ash/shell/app_list.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.cc ('k') | ash/shell/content/client/shell_browser_main_parts.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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/shell.h"
12 #include "ash/shell/example_factory.h" 13 #include "ash/shell/example_factory.h"
13 #include "ash/shell/toplevel_window.h" 14 #include "ash/shell/toplevel_window.h"
14 #include "base/callback.h" 15 #include "base/callback.h"
15 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
16 #include "base/i18n/case_conversion.h" 17 #include "base/i18n/case_conversion.h"
17 #include "base/i18n/string_search.h" 18 #include "base/i18n/string_search.h"
18 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
19 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 void StopSearch() override { 276 void StopSearch() override {
276 // Nothing needs to be done. 277 // Nothing needs to be done.
277 } 278 }
278 279
279 void ViewInitialized() override { 280 void ViewInitialized() override {
280 // Nothing needs to be done. 281 // Nothing needs to be done.
281 } 282 }
282 283
283 void Dismiss() override { 284 void Dismiss() override {
284 DCHECK(WmShell::HasInstance()); 285 DCHECK(WmShell::HasInstance());
285 WmShell::Get()->DismissAppList(); 286 Shell::Get()->DismissAppList();
286 } 287 }
287 288
288 void ViewClosing() override { 289 void ViewClosing() override {
289 // Nothing needs to be done. 290 // Nothing needs to be done.
290 } 291 }
291 292
292 void OpenHelp() override { 293 void OpenHelp() override {
293 // Nothing needs to be done. 294 // Nothing needs to be done.
294 } 295 }
295 296
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 }; 328 };
328 329
329 } // namespace 330 } // namespace
330 331
331 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 332 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
332 return new ExampleAppListViewDelegate; 333 return new ExampleAppListViewDelegate;
333 } 334 }
334 335
335 } // namespace shell 336 } // namespace shell
336 } // namespace ash 337 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698