| 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 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1127 void BrowserWindowGtk::Copy() { | 1127 void BrowserWindowGtk::Copy() { |
| 1128 gtk_window_util::DoCopy( | 1128 gtk_window_util::DoCopy( |
| 1129 window_, chrome::GetActiveWebContents(browser_.get())); | 1129 window_, chrome::GetActiveWebContents(browser_.get())); |
| 1130 } | 1130 } |
| 1131 | 1131 |
| 1132 void BrowserWindowGtk::Paste() { | 1132 void BrowserWindowGtk::Paste() { |
| 1133 gtk_window_util::DoPaste( | 1133 gtk_window_util::DoPaste( |
| 1134 window_, chrome::GetActiveWebContents(browser_.get())); | 1134 window_, chrome::GetActiveWebContents(browser_.get())); |
| 1135 } | 1135 } |
| 1136 | 1136 |
| 1137 void BrowserWindowGtk::ShowInstant(TabContents* preview) { | 1137 void BrowserWindowGtk::ShowInstant(TabContents* preview, |
| 1138 int height, |
| 1139 InstantSizeUnits units) { |
| 1140 // TODO(jered): Support height < 100%. |
| 1141 DCHECK(height == 100 && units == INSTANT_SIZE_PERCENT); |
| 1138 contents_container_->SetPreview(preview); | 1142 contents_container_->SetPreview(preview); |
| 1139 MaybeShowBookmarkBar(false); | 1143 MaybeShowBookmarkBar(false); |
| 1140 } | 1144 } |
| 1141 | 1145 |
| 1142 void BrowserWindowGtk::HideInstant() { | 1146 void BrowserWindowGtk::HideInstant() { |
| 1143 contents_container_->PopPreview(); | 1147 contents_container_->PopPreview(); |
| 1144 MaybeShowBookmarkBar(false); | 1148 MaybeShowBookmarkBar(false); |
| 1145 } | 1149 } |
| 1146 | 1150 |
| 1147 gfx::Rect BrowserWindowGtk::GetInstantBounds() { | 1151 gfx::Rect BrowserWindowGtk::GetInstantBounds() { |
| (...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2433 wm_type == ui::WM_OPENBOX || | 2437 wm_type == ui::WM_OPENBOX || |
| 2434 wm_type == ui::WM_XFWM4); | 2438 wm_type == ui::WM_XFWM4); |
| 2435 } | 2439 } |
| 2436 | 2440 |
| 2437 // static | 2441 // static |
| 2438 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2442 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2439 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2443 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2440 browser_window_gtk->Init(); | 2444 browser_window_gtk->Init(); |
| 2441 return browser_window_gtk; | 2445 return browser_window_gtk; |
| 2442 } | 2446 } |
| OLD | NEW |