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

Side by Side Diff: ash/shell/app_list.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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/shell_delegate_impl.h » ('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.h"
13 #include "ash/shell/example_factory.h" 13 #include "ash/shell/example_factory.h"
14 #include "ash/shell/toplevel_window.h" 14 #include "ash/shell/toplevel_window.h"
15 #include "ash/shell_delegate.h"
16 #include "base/callback.h" 15 #include "base/callback.h"
17 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
18 #include "base/i18n/case_conversion.h" 17 #include "base/i18n/case_conversion.h"
19 #include "base/i18n/string_search.h" 18 #include "base/i18n/string_search.h"
20 #include "base/memory/scoped_vector.h" 19 #include "base/memory/scoped_vector.h"
21 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
22 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
23 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
24 #include "ui/app_list/app_list_item.h" 23 #include "ui/app_list/app_list_item.h"
25 #include "ui/app_list/app_list_item_list.h" 24 #include "ui/app_list/app_list_item_list.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 }; 354 };
356 355
357 } // namespace 356 } // namespace
358 357
359 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 358 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
360 return new ExampleAppListViewDelegate; 359 return new ExampleAppListViewDelegate;
361 } 360 }
362 361
363 } // namespace shell 362 } // namespace shell
364 } // namespace ash 363 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698