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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual bool IsOpen() const OVERRIDE; 59 virtual bool IsOpen() const OVERRIDE;
60 virtual bool IsVisible() const OVERRIDE; 60 virtual bool IsVisible() const OVERRIDE;
61 virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE; 61 virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
62 virtual void Activate(ash::LaunchSource source) OVERRIDE; 62 virtual void Activate(ash::LaunchSource source) OVERRIDE;
63 virtual void Close() OVERRIDE; 63 virtual void Close() OVERRIDE;
64 virtual ChromeLauncherAppMenuItems GetApplicationList( 64 virtual ChromeLauncherAppMenuItems GetApplicationList(
65 int event_flags) OVERRIDE; 65 int event_flags) OVERRIDE;
66 virtual void ItemSelected(const ui::Event& eent) OVERRIDE; 66 virtual void ItemSelected(const ui::Event& eent) OVERRIDE;
67 virtual base::string16 GetTitle() OVERRIDE; 67 virtual base::string16 GetTitle() OVERRIDE;
68 virtual ui::MenuModel* CreateContextMenu( 68 virtual ui::MenuModel* CreateContextMenu(
69 aura::RootWindow* root_window) OVERRIDE; 69 aura::Window* root_window) OVERRIDE;
70 virtual ash::LauncherMenuModel* CreateApplicationMenu( 70 virtual ash::LauncherMenuModel* CreateApplicationMenu(
71 int event_flags) OVERRIDE; 71 int event_flags) OVERRIDE;
72 virtual bool IsDraggable() OVERRIDE; 72 virtual bool IsDraggable() OVERRIDE;
73 virtual bool ShouldShowTooltip() OVERRIDE; 73 virtual bool ShouldShowTooltip() OVERRIDE;
74 74
75 // aura::WindowObserver overrides: 75 // aura::WindowObserver overrides:
76 virtual void OnWindowPropertyChanged(aura::Window* window, 76 virtual void OnWindowPropertyChanged(aura::Window* window,
77 const void* key, 77 const void* key,
78 intptr_t old) OVERRIDE; 78 intptr_t old) OVERRIDE;
79 79
(...skipping 22 matching lines...) Expand all
102 // AppLauncherItemController for each |app_launcher_id_|. 102 // AppLauncherItemController for each |app_launcher_id_|.
103 const std::string app_launcher_id_; 103 const std::string app_launcher_id_;
104 104
105 // Scoped list of observed windows (for removal on destruction) 105 // Scoped list of observed windows (for removal on destruction)
106 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 106 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
107 107
108 DISALLOW_COPY_AND_ASSIGN(ShellWindowLauncherItemController); 108 DISALLOW_COPY_AND_ASSIGN(ShellWindowLauncherItemController);
109 }; 109 };
110 110
111 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_ H_ 111 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698