diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 00:38:33 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 00:38:33 +0000 |
commit | 431552ca5af1f9d2cb09994e1d75e1d7f30cf002 (patch) | |
tree | 545584aa7c60c78021fa18e38c04c20fb248c31d /ash/root_window_controller.h | |
parent | 1cca163c30823ea0531b9a84ddeb5a136c0927ad (diff) | |
download | chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.zip chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.tar.gz chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.tar.bz2 |
Context menu for multiple launchers
- move the code to create/open context menu from launcher to
root window controller.
- updated methods that access shelf/launcher state to take root window so that menu can specify on which display it is working on.
BUG=145978, 155776
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11198078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
-rw-r--r-- | ash/root_window_controller.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 170c0c2..e264b3c 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -13,6 +13,10 @@ class SkBitmap; +namespace gfx { +class Point; +} + namespace aura { class EventFilter; class RootWindow; @@ -73,6 +77,10 @@ class ASH_EXPORT RootWindowController { return status_area_widget_; } + // Shows context menu at the |location_in_screen|. This uses + // |ShellDelegate::CreateContextMenu| to define the content of the menu. + void ShowContextMenu(const gfx::Point& location_in_screen); + // Returns the layout-manager for the appropriate modal-container. If the // window is inside the lockscreen modal container, then the layout manager // for that is returned. Otherwise the layout manager for the default modal @@ -135,7 +143,11 @@ class ASH_EXPORT RootWindowController { bool SetShelfAlignment(ShelfAlignment alignment); ShelfAlignment GetShelfAlignment(); -private: + // Get the shelf's auto hide status. + bool IsShelfAutoHideMenuHideChecked(); + ShelfAutoHideBehavior GetToggledShelfAutoHideBehavior(); + + private: // Creates each of the special window containers that holds windows of various // types in the shell UI. void CreateContainersInRootWindow(aura::RootWindow* root_window); |