diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 20:27:28 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 20:27:28 +0000 |
| commit | cb054f97d1ba2b7c11b05697ddb46bf3f50ff9a4 (patch) | |
| tree | 3edf609873567e663a5d7f55f49750af574a51e2 /ash/shell.cc | |
| parent | 98648a35e54bf7c4ba7564ebae9e43a109554639 (diff) | |
| download | chromium_src-cb054f97d1ba2b7c11b05697ddb46bf3f50ff9a4.zip chromium_src-cb054f97d1ba2b7c11b05697ddb46bf3f50ff9a4.tar.gz chromium_src-cb054f97d1ba2b7c11b05697ddb46bf3f50ff9a4.tar.bz2 | |
Add Wallpaper option to launcher context menu
BUG=143015
Review URL: https://codereview.chromium.org/11092034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 9de3e091..95b6f9d 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -25,7 +25,6 @@ #include "ash/magnifier/magnification_controller.h" #include "ash/root_window_controller.h" #include "ash/screen_ash.h" -#include "ash/shell_context_menu.h" #include "ash/shell_delegate.h" #include "ash/shell_factory.h" #include "ash/shell_window_ids.h" @@ -390,7 +389,6 @@ void Shell::Init() { nested_dispatcher_controller_.reset(new NestedDispatcherController); accelerator_controller_.reset(new AcceleratorController); #endif - shell_context_menu_.reset(new internal::ShellContextMenu); // The order in which event filters are added is significant. user_activity_detector_.reset(new UserActivityDetector); @@ -523,16 +521,15 @@ void Shell::RemoveEnvEventFilter(aura::EventFilter* filter) { aura::Env::GetInstance()->RemovePreTargetHandler(filter); } -void Shell::ShowBackgroundMenu(views::Widget* widget, - const gfx::Point& location) { +void Shell::ShowContextMenu(const gfx::Point& location) { // No context menus if user have not logged in. if (!delegate_.get() || !delegate_->IsUserLoggedIn()) return; // No context menus when screen is locked. if (IsScreenLocked()) return; - if (shell_context_menu_.get()) - shell_context_menu_->ShowMenu(widget, location); + if (launcher()) + launcher()->ShowContextMenu(location); } void Shell::ToggleAppList() { |