diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 02:20:55 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 02:20:55 +0000 |
commit | b6b9b4ec85ba5dee24bf190adec3338a67f54e0e (patch) | |
tree | 212e09f78ccc01e95102fe4f1aaf0bfd19e314fa /chrome/browser/ui/gtk/browser_window_gtk.cc | |
parent | 0883c2a9dd2c9e6beb06ab0d7a4eaf39974e964f (diff) | |
download | chromium_src-b6b9b4ec85ba5dee24bf190adec3338a67f54e0e.zip chromium_src-b6b9b4ec85ba5dee24bf190adec3338a67f54e0e.tar.gz chromium_src-b6b9b4ec85ba5dee24bf190adec3338a67f54e0e.tar.bz2 |
Revert 167286 - [GTK] Dirty hack to potentially fix double title bar buttons issue on Unity.
BUG=75485
R=estade@chromium.org
Review URL: https://codereview.chromium.org/11368161
TBR=dbeam@chromium.org
Review URL: https://codereview.chromium.org/11414021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 39a6bcb..e10ca39 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -74,7 +74,6 @@ #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/ui/gtk/task_manager_gtk.h" -#include "chrome/browser/ui/gtk/unity_service.h" #include "chrome/browser/ui/gtk/update_recommended_dialog.h" #include "chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.h" #include "chrome/browser/ui/omnibox/location_bar.h" @@ -1395,31 +1394,12 @@ gboolean BrowserWindowGtk::OnWindowState(GtkWidget* sender, content::NotificationService::NoDetails()); } - // This is a dirty dirty hack to fix double titlebar chrome when using Unity. - // http://crbug.com/75485 - if (unity::IsRunning() && !(state_ & GDK_WINDOW_STATE_MAXIMIZED) && - UseCustomFrame()) { - MessageLoop::current()->PostTask(FROM_HERE, - base::Bind(&BrowserWindowGtk::SetDecoratedHack, - base::Unretained(this))); - } - titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); UpdateWindowShape(bounds_.width(), bounds_.height()); SaveWindowPosition(); return FALSE; } -void BrowserWindowGtk::SetDecoratedHack() { - if (!window_) - return; - - PrefService* prefs = browser()->profile()->GetPrefs(); - bool orig_value = prefs->GetBoolean(prefs::kUseCustomChromeFrame); - prefs->SetBoolean(prefs::kUseCustomChromeFrame, !orig_value); - prefs->SetBoolean(prefs::kUseCustomChromeFrame, orig_value); -} - // Callback for the delete event. This event is fired when the user tries to // close the window (e.g., clicking on the X in the window manager title bar). gboolean BrowserWindowGtk::OnMainWindowDeleteEvent(GtkWidget* widget, |