| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 833 // a timer through LoadingAnimationCallback. | 833 // a timer through LoadingAnimationCallback. |
| 834 titlebar_->UpdateThrobber(web_contents); | 834 titlebar_->UpdateThrobber(web_contents); |
| 835 } | 835 } |
| 836 } | 836 } |
| 837 | 837 |
| 838 void BrowserWindowGtk::SetStarredState(bool is_starred) { | 838 void BrowserWindowGtk::SetStarredState(bool is_starred) { |
| 839 toolbar_->GetLocationBarView()->SetStarred(is_starred); | 839 toolbar_->GetLocationBarView()->SetStarred(is_starred); |
| 840 } | 840 } |
| 841 | 841 |
| 842 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) { | 842 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) { |
| 843 toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble); | 843 toolbar_->GetLocationBarView()->ZoomChangedForActiveTab( |
| 844 can_show_bubble && !toolbar_->IsWrenchMenuShowing()); |
| 844 } | 845 } |
| 845 | 846 |
| 846 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const { | 847 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const { |
| 847 return restored_bounds_; | 848 return restored_bounds_; |
| 848 } | 849 } |
| 849 | 850 |
| 850 gfx::Rect BrowserWindowGtk::GetBounds() const { | 851 gfx::Rect BrowserWindowGtk::GetBounds() const { |
| 851 return bounds_; | 852 return bounds_; |
| 852 } | 853 } |
| 853 | 854 |
| (...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2481 wm_type == ui::WM_OPENBOX || | 2482 wm_type == ui::WM_OPENBOX || |
| 2482 wm_type == ui::WM_XFWM4); | 2483 wm_type == ui::WM_XFWM4); |
| 2483 } | 2484 } |
| 2484 | 2485 |
| 2485 // static | 2486 // static |
| 2486 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2487 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2487 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2488 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2488 browser_window_gtk->Init(); | 2489 browser_window_gtk->Init(); |
| 2489 return browser_window_gtk; | 2490 return browser_window_gtk; |
| 2490 } | 2491 } |
| OLD | NEW |