diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 04:33:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 04:33:39 +0000 |
| commit | 8c0ec432f90e6056a62684ef73ff488a61fe84d2 (patch) | |
| tree | 17406995dffef2a3f91697bca8430afab712219b /ash/wm | |
| parent | 08f1e345d3d5d030a0e18179f0fe7667bc1a3aba (diff) | |
| download | chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.zip chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.tar.gz chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.tar.bz2 | |
Remove ash-disable-launcher-per-display flag
BUG=239681
TEST=none
Review URL: https://chromiumcodereview.appspot.com/14584004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/ash_activation_controller.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/wm/ash_activation_controller.cc b/ash/wm/ash_activation_controller.cc index f8c338a..2c02374 100644 --- a/ash/wm/ash_activation_controller.cc +++ b/ash/wm/ash_activation_controller.cc @@ -96,9 +96,7 @@ aura::Window* AshActivationController::PrepareToActivateLauncher() { if (!Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled()) return NULL; ShelfWidget* shelf = GetRootWindowController( - Shell::IsLauncherPerDisplayEnabled() ? - Shell::GetActiveRootWindow() : - Shell::GetPrimaryRootWindow())->shelf(); + Shell::GetActiveRootWindow())->shelf(); // Launcher's window may be already destroyed in shutting down process. if (!shelf) return NULL; |