diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 22:49:07 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 22:49:07 +0000 |
| commit | f634dd3d11f123a08653d63ea4d2a5cfdd6a8082 (patch) | |
| tree | dc4fb29a9317012dfe6b2569821b915b40297bef /ash/shell_context_menu.cc | |
| parent | 414c89d95a795b6b23eedea122e2593e5b87e585 (diff) | |
| download | chromium_src-f634dd3d11f123a08653d63ea4d2a5cfdd6a8082.zip chromium_src-f634dd3d11f123a08653d63ea4d2a5cfdd6a8082.tar.gz chromium_src-f634dd3d11f123a08653d63ea4d2a5cfdd6a8082.tar.bz2 | |
Enable Virtual Screen Coordinates and remove --ash-virtual-screen-coordinates
Update tests to work with VSC.
I'll land this after http://codereview.chromium.org/10795027/ is landed.
I kept active_root_window_ because we're planning to create a launcher per display, and I'm going to use it to decide on which display the status bubble will be shown.
BUG=123160
TEST=Updated tests, plus added new test cases to ExtendedDesktopText.ConvertPoint
Review URL: https://chromiumcodereview.appspot.com/10790090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_context_menu.cc')
| -rw-r--r-- | ash/shell_context_menu.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/shell_context_menu.cc b/ash/shell_context_menu.cc index 7cf6f86..e704147 100644 --- a/ash/shell_context_menu.cc +++ b/ash/shell_context_menu.cc @@ -25,11 +25,6 @@ ShellContextMenu::~ShellContextMenu() { void ShellContextMenu::ShowMenu(views::Widget* widget, const gfx::Point& location) { - if (!internal::DisplayController::IsVirtualScreenCoordinatesEnabled()) { - Shell::GetInstance()->set_active_root_window( - widget->GetNativeView()->GetRootWindow()); - } - ui::SimpleMenuModel menu_model(this); menu_model.AddItem(MENU_CHANGE_WALLPAPER, l10n_util::GetStringUTF16(IDS_AURA_SET_DESKTOP_WALLPAPER)); |