| 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 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1148 } | 1148 } |
| 1149 | 1149 |
| 1150 gfx::Rect BrowserWindowGtk::GetInstantBounds() { | 1150 gfx::Rect BrowserWindowGtk::GetInstantBounds() { |
| 1151 return ui::GetWidgetScreenBounds(contents_container_->widget()); | 1151 return ui::GetWidgetScreenBounds(contents_container_->widget()); |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 bool BrowserWindowGtk::IsInstantTabShowing() { | 1154 bool BrowserWindowGtk::IsInstantTabShowing() { |
| 1155 return contents_container_->HasPreview(); | 1155 return contents_container_->HasPreview(); |
| 1156 } | 1156 } |
| 1157 | 1157 |
| 1158 void BrowserWindowGtk::SetInstantHasCustomLogo(bool has_logo) { |
| 1159 } |
| 1160 |
| 1158 WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds( | 1161 WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds( |
| 1159 const gfx::Rect& bounds) { | 1162 const gfx::Rect& bounds) { |
| 1160 return NEW_POPUP; | 1163 return NEW_POPUP; |
| 1161 } | 1164 } |
| 1162 | 1165 |
| 1163 FindBar* BrowserWindowGtk::CreateFindBar() { | 1166 FindBar* BrowserWindowGtk::CreateFindBar() { |
| 1164 return new FindBarGtk(this); | 1167 return new FindBarGtk(this); |
| 1165 } | 1168 } |
| 1166 | 1169 |
| 1167 bool BrowserWindowGtk::GetConstrainedWindowTopY(int* top_y) { | 1170 bool BrowserWindowGtk::GetConstrainedWindowTopY(int* top_y) { |
| (...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2418 wm_type == ui::WM_OPENBOX || | 2421 wm_type == ui::WM_OPENBOX || |
| 2419 wm_type == ui::WM_XFWM4); | 2422 wm_type == ui::WM_XFWM4); |
| 2420 } | 2423 } |
| 2421 | 2424 |
| 2422 // static | 2425 // static |
| 2423 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2426 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2424 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2427 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2425 browser_window_gtk->Init(); | 2428 browser_window_gtk->Init(); |
| 2426 return browser_window_gtk; | 2429 return browser_window_gtk; |
| 2427 } | 2430 } |
| OLD | NEW |