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

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

Issue 2332393003: mash: Remove shelf util functions; use WmWindow properties. (Closed)
Patch Set: Address comments. Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_ H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_ H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_ H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_ H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "ash/shelf/shelf_util.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
15 #include "extensions/browser/app_window/app_window_registry.h" 14 #include "extensions/browser/app_window/app_window_registry.h"
16 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
17 16
18 namespace aura { 17 namespace aura {
19
20 class Window; 18 class Window;
21 } 19 }
22 20
23 namespace extensions { 21 namespace extensions {
24 class AppWindow; 22 class AppWindow;
25 } 23 }
26 24
27 class ChromeLauncherController; 25 class ChromeLauncherController;
28 class Profile; 26 class Profile;
29 class ExtensionAppWindowLauncherItemController; 27 class ExtensionAppWindowLauncherItemController;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Map of app launcher id to controller. 75 // Map of app launcher id to controller.
78 AppControllerMap app_controller_map_; 76 AppControllerMap app_controller_map_;
79 77
80 // Allows us to get from an aura::Window to the app shelf id. 78 // Allows us to get from an aura::Window to the app shelf id.
81 WindowToAppShelfIdMap window_to_app_shelf_id_map_; 79 WindowToAppShelfIdMap window_to_app_shelf_id_map_;
82 80
83 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController); 81 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController);
84 }; 82 };
85 83
86 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLL ER_H_ 84 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLL ER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698