| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 044ba06d5c4d6ba79b2fd7d444aa21cf44810819..a7365d822e4ca8c54089ac76f22e475f1576ca0a 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -97,7 +97,6 @@ class RootWindowLayoutManager;
|
| class ScreenPositionController;
|
| class ShadowController;
|
| class ShelfLayoutManager;
|
| -class ShellContextMenu;
|
| class SlowAnimationEventFilter;
|
| class StackingController;
|
| class StatusAreaWidget;
|
| @@ -192,8 +191,9 @@ class ASH_EXPORT Shell : CursorDelegate,
|
| void AddEnvEventFilter(aura::EventFilter* filter);
|
| void RemoveEnvEventFilter(aura::EventFilter* filter);
|
|
|
| - // Shows the background menu over |widget|.
|
| - void ShowBackgroundMenu(views::Widget* widget, const gfx::Point& location);
|
| + // Shows the context menu for the background and launcher at
|
| + // |location| (in screen coordinates).
|
| + void ShowContextMenu(const gfx::Point& location);
|
|
|
| // Toggles app list.
|
| void ToggleAppList();
|
| @@ -436,7 +436,6 @@ class ASH_EXPORT Shell : CursorDelegate,
|
|
|
| scoped_ptr<internal::AppListController> app_list_controller_;
|
|
|
| - scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
|
| scoped_ptr<internal::StackingController> stacking_controller_;
|
| scoped_ptr<internal::ActivationController> activation_controller_;
|
| scoped_ptr<internal::CaptureController> capture_controller_;
|
|
|