diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 01:53:45 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 01:53:45 +0000 |
commit | 49112405d3b50ee64718b90cca06d1741be2b9f3 (patch) | |
tree | e012a7af2138985198d2cfd2fcdfcd7d78086e58 /chrome/browser/ui/panels/display_settings_provider.cc | |
parent | 773040599d303c26919a020017102ddc8b7b1fd7 (diff) | |
download | chromium_src-49112405d3b50ee64718b90cca06d1741be2b9f3.zip chromium_src-49112405d3b50ee64718b90cca06d1741be2b9f3.tar.gz chromium_src-49112405d3b50ee64718b90cca06d1741be2b9f3.tar.bz2 |
Revert 125278 - Fix bug 114813: Resolution/screen configuration changes are missed if no panels exist during the change
BUG=114813
TEST=Manual test by closing all panels, changing resolution and opening a new panel
Review URL: http://codereview.chromium.org/9395059
TBR=jianli@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/panels/display_settings_provider.cc')
-rw-r--r-- | chrome/browser/ui/panels/display_settings_provider.cc | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc deleted file mode 100644 index 05c0dc5..0000000 --- a/chrome/browser/ui/panels/display_settings_provider.cc +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/panels/display_settings_provider.h" - -#include "base/logging.h" -#include "ui/gfx/screen.h" - -DisplaySettingsProvider::DisplaySettingsProvider(Observer* observer) - : observer_(observer) { - DCHECK(observer); -} - -DisplaySettingsProvider::~DisplaySettingsProvider() { -} - -gfx::Rect DisplaySettingsProvider::GetWorkArea() { -#if defined(OS_MACOSX) - // On OSX, panels should be dropped all the way to the bottom edge of the - // screen (and overlap Dock). - gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorBounds(); -#else - gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea(); -#endif - - if (work_area_ != work_area) { - work_area_ = work_area; - OnWorkAreaChanged(); - } - - return work_area; -} - -void DisplaySettingsProvider::OnWorkAreaChanged() { -} - -bool DisplaySettingsProvider::IsAutoHidingDesktopBarEnabled( - DesktopBarAlignment alignment) { - return false; -} - -int DisplaySettingsProvider::GetDesktopBarThickness( - DesktopBarAlignment alignment) const { - return 0; -} - -DisplaySettingsProvider::DesktopBarVisibility -DisplaySettingsProvider::GetDesktopBarVisibility( - DesktopBarAlignment alignment) const { - return DESKTOP_BAR_VISIBLE; -} - -#if !defined(OS_WIN) -// static -DisplaySettingsProvider* DisplaySettingsProvider::Create(Observer* observer) { - return new DisplaySettingsProvider(observer); -} -#endif |