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

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

Issue 2927693002: mash: Limit ShelfWindowWatcher to panels and dialogs. (Closed)
Patch Set: Disable WindowSelectorTest.MultipleDisplays in mash. Created 3 years, 6 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>
(...skipping 27 matching lines...) Expand all
38 explicit ExtensionAppWindowLauncherController( 38 explicit ExtensionAppWindowLauncherController(
39 ChromeLauncherController* owner); 39 ChromeLauncherController* owner);
40 ~ExtensionAppWindowLauncherController() override; 40 ~ExtensionAppWindowLauncherController() override;
41 41
42 // AppWindowLauncherController: 42 // AppWindowLauncherController:
43 void AdditionalUserAddedToSession(Profile* profile) override; 43 void AdditionalUserAddedToSession(Profile* profile) override;
44 AppWindowLauncherItemController* ControllerForWindow( 44 AppWindowLauncherItemController* ControllerForWindow(
45 aura::Window* window) override; 45 aura::Window* window) override;
46 46
47 // Overridden from AppWindowRegistry::Observer: 47 // Overridden from AppWindowRegistry::Observer:
48 void OnAppWindowAdded(extensions::AppWindow* app_window) override;
48 void OnAppWindowShown(extensions::AppWindow* app_window, 49 void OnAppWindowShown(extensions::AppWindow* app_window,
49 bool was_hidden) override; 50 bool was_hidden) override;
50 void OnAppWindowHidden(extensions::AppWindow* app_window) override; 51 void OnAppWindowHidden(extensions::AppWindow* app_window) override;
51 52
52 // Overriden from aura::WindowObserver: 53 // Overriden from aura::WindowObserver:
53 void OnWindowDestroying(aura::Window* window) override; 54 void OnWindowDestroying(aura::Window* window) override;
54 55
55 protected: 56 protected:
56 // Registers a app window with the shelf and this object. 57 // Registers a app window with the shelf and this object.
57 void RegisterApp(extensions::AppWindow* app_window); 58 void RegisterApp(extensions::AppWindow* app_window);
(...skipping 16 matching lines...) Expand all
74 // Map of shelf id to controller. 75 // Map of shelf id to controller.
75 AppControllerMap app_controller_map_; 76 AppControllerMap app_controller_map_;
76 77
77 // Map of aura::Windows to shelf ids. 78 // Map of aura::Windows to shelf ids.
78 std::map<aura::Window*, ash::ShelfID> window_to_shelf_id_map_; 79 std::map<aura::Window*, ash::ShelfID> window_to_shelf_id_map_;
79 80
80 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController); 81 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController);
81 }; 82 };
82 83
83 #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