diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 22:28:07 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 22:28:07 +0000 |
| commit | 855751ac8936c378f4d99ffed8c025ad4967144b (patch) | |
| tree | 03cef44a900962ae202656188665d31a486b8873 | |
| parent | b9fb8af358bcb5a5ed8526ccfd0aa3540c1bb648 (diff) | |
| download | chromium_src-855751ac8936c378f4d99ffed8c025ad4967144b.zip chromium_src-855751ac8936c378f4d99ffed8c025ad4967144b.tar.gz chromium_src-855751ac8936c378f4d99ffed8c025ad4967144b.tar.bz2 | |
Revert 234380 "Disabling shelf auto hide menu for Ash on Windows."
> Disabling shelf auto hide menu for Ash on Windows.
>
> R=skuhne
> CC=cpu,ananta
> BUG=292864
>
> Review URL: https://codereview.chromium.org/63263003
TBR=shrikant@chromium.org
Review URL: https://codereview.chromium.org/157033002
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@249521 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index d9c39f3..93eeb16 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -902,13 +902,6 @@ ash::ShelfAutoHideBehavior ChromeLauncherController::GetShelfAutoHideBehavior( if (chrome::IsRunningInAppMode()) return ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN; -#if defined(OS_WIN) - // Autohide functionality temporarily disabled for windows due to - // issue crbug.com/292864. - // TODO(shrikant): Remove this once the issue gets resolved. - return ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER; -#endif - // See comment in |kShelfAlignment| as to why we consider two prefs. const std::string behavior_value( GetPrefForRootWindow(profile_->GetPrefs(), @@ -927,12 +920,6 @@ ash::ShelfAutoHideBehavior ChromeLauncherController::GetShelfAutoHideBehavior( bool ChromeLauncherController::CanUserModifyShelfAutoHideBehavior( aura::Window* root_window) const { -#if defined(OS_WIN) - // Autohide functionality temporarily disabled for windows due to - // issue crbug.com/292864. - // TODO(shrikant): Remove this once the issue gets resolved. - return false; -#endif return profile_->GetPrefs()-> FindPreference(prefs::kShelfAutoHideBehaviorLocal)->IsUserModifiable(); } |