| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 | 791 |
| 792 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) { | 792 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) { |
| 793 toolbar_->GetLocationBarView()->ZoomChangedForActiveTab( | 793 toolbar_->GetLocationBarView()->ZoomChangedForActiveTab( |
| 794 can_show_bubble && !toolbar_->IsWrenchMenuShowing()); | 794 can_show_bubble && !toolbar_->IsWrenchMenuShowing()); |
| 795 } | 795 } |
| 796 | 796 |
| 797 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const { | 797 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const { |
| 798 return restored_bounds_; | 798 return restored_bounds_; |
| 799 } | 799 } |
| 800 | 800 |
| 801 ui::WindowShowState BrowserWindowGtk::GetRestoredState() const { |
| 802 if (IsMaximized()) |
| 803 return ui::SHOW_STATE_MAXIMIZED; |
| 804 if (IsMinimized()) |
| 805 return ui::SHOW_STATE_MINIMIZED; |
| 806 return ui::SHOW_STATE_NORMAL; |
| 807 } |
| 808 |
| 801 gfx::Rect BrowserWindowGtk::GetBounds() const { | 809 gfx::Rect BrowserWindowGtk::GetBounds() const { |
| 802 return bounds_; | 810 return bounds_; |
| 803 } | 811 } |
| 804 | 812 |
| 805 bool BrowserWindowGtk::IsMaximized() const { | 813 bool BrowserWindowGtk::IsMaximized() const { |
| 806 return (state_ & GDK_WINDOW_STATE_MAXIMIZED); | 814 return (state_ & GDK_WINDOW_STATE_MAXIMIZED); |
| 807 } | 815 } |
| 808 | 816 |
| 809 bool BrowserWindowGtk::IsMinimized() const { | 817 bool BrowserWindowGtk::IsMinimized() const { |
| 810 return (state_ & GDK_WINDOW_STATE_ICONIFIED); | 818 return (state_ & GDK_WINDOW_STATE_ICONIFIED); |
| (...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2394 wm_type == ui::WM_OPENBOX || | 2402 wm_type == ui::WM_OPENBOX || |
| 2395 wm_type == ui::WM_XFWM4); | 2403 wm_type == ui::WM_XFWM4); |
| 2396 } | 2404 } |
| 2397 | 2405 |
| 2398 // static | 2406 // static |
| 2399 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2407 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2400 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2408 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2401 browser_window_gtk->Init(); | 2409 browser_window_gtk->Init(); |
| 2402 return browser_window_gtk; | 2410 return browser_window_gtk; |
| 2403 } | 2411 } |
| OLD | NEW |