chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h - Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix wallpaper tests again 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 | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_

7	7

8 #include <list>	8 #include <list>

9 #include <memory>	9 #include <memory>

10	10

	11 #include "ash/common/shelf/shelf_delegate.h"

11 #include "ash/common/shelf/shelf_model_observer.h"	12 #include "ash/common/shelf/shelf_model_observer.h"

12 #include "ash/common/shelf/shelf_types.h"	13 #include "ash/common/shelf/shelf_types.h"

13 #include "ash/display/window_tree_host_manager.h"	14 #include "ash/display/window_tree_host_manager.h"

14 #include "ash/shelf/shelf_delegate.h"

15 #include "base/compiler_specific.h"	15 #include "base/compiler_specific.h"

16 #include "base/macros.h"	16 #include "base/macros.h"

17 #include "build/build_config.h"	17 #include "build/build_config.h"

18 #include "chrome/browser/ui/app_icon_loader.h"	18 #include "chrome/browser/ui/app_icon_loader.h"

19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"	19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"

20 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"	20 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"

21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

22 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"	22 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"

23 #include "components/prefs/pref_change_registrar.h"	23 #include "components/prefs/pref_change_registrar.h"

24 #include "ui/aura/window_observer.h"	24 #include "ui/aura/window_observer.h"

(...skipping 329 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
354 // The list of running & un-pinned applications for different users on hidden	354 // The list of running & un-pinned applications for different users on hidden

355 // desktops.	355 // desktops.

356 typedef std::vector<std::string> RunningAppListIds;	356 typedef std::vector<std::string> RunningAppListIds;

357 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;	357 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;

358 RunningAppListIdMap last_used_running_application_order_;	358 RunningAppListIdMap last_used_running_application_order_;

359	359

360 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);	360 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);

361 };	361 };

362	362

363 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_	363 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_

OLD	NEW