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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.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, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index 3fc1dd94766905739f1516bd4e52e5700dc2a930..5b89dfb33fdaa6a248abe9de9537f6a8c96000f2 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -15,7 +15,7 @@
class ChromeLauncherController;
namespace aura {
-class RootWindow;
+class Window;
}
namespace extensions {
@@ -30,10 +30,10 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
// |clicked on an area with no icons).
LauncherContextMenu(ChromeLauncherController* controller,
const ash::LauncherItem* item,
- aura::RootWindow* root_window);
+ aura::Window* root_window);
// Creates a menu used as a desktop context menu on |root_window|.
LauncherContextMenu(ChromeLauncherController* controller,
- aura::RootWindow* root_window);
+ aura::Window* root_window);
virtual ~LauncherContextMenu();
void Init();
@@ -88,7 +88,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
scoped_ptr<extensions::ContextMenuMatcher> extension_items_;
- aura::RootWindow* root_window_;
+ aura::Window* root_window_;
DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
};

Powered by Google App Engine
This is Rietveld 408576698