Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 8298005: Fixes bug in instant where we would end up incorrectly using the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweak Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.h ('k') | chrome/browser/ui/panels/panel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <dlfcn.h> 9 #include <dlfcn.h>
10 #include <string> 10 #include <string>
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 1147
1148 void BrowserWindowGtk::Paste() { 1148 void BrowserWindowGtk::Paste() {
1149 gtk_util::DoPaste(this); 1149 gtk_util::DoPaste(this);
1150 } 1150 }
1151 1151
1152 void BrowserWindowGtk::ShowInstant(TabContentsWrapper* preview) { 1152 void BrowserWindowGtk::ShowInstant(TabContentsWrapper* preview) {
1153 contents_container_->SetPreview(preview); 1153 contents_container_->SetPreview(preview);
1154 MaybeShowBookmarkBar(false); 1154 MaybeShowBookmarkBar(false);
1155 } 1155 }
1156 1156
1157 void BrowserWindowGtk::HideInstant(bool instant_is_active) { 1157 void BrowserWindowGtk::HideInstant() {
1158 contents_container_->PopPreview(); 1158 contents_container_->PopPreview();
1159 MaybeShowBookmarkBar(false); 1159 MaybeShowBookmarkBar(false);
1160 } 1160 }
1161 1161
1162 gfx::Rect BrowserWindowGtk::GetInstantBounds() { 1162 gfx::Rect BrowserWindowGtk::GetInstantBounds() {
1163 return gtk_util::GetWidgetScreenBounds(contents_container_->widget()); 1163 return gtk_util::GetWidgetScreenBounds(contents_container_->widget());
1164 } 1164 }
1165 1165
1166 WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds( 1166 WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds(
1167 const gfx::Rect& bounds) { 1167 const gfx::Rect& bounds) {
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
2388 wm_name == "Openbox" || 2388 wm_name == "Openbox" ||
2389 wm_name == "Xfwm4"); 2389 wm_name == "Xfwm4");
2390 } 2390 }
2391 2391
2392 // static 2392 // static
2393 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2393 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2394 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); 2394 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
2395 browser_window_gtk->Init(); 2395 browser_window_gtk->Init();
2396 return browser_window_gtk; 2396 return browser_window_gtk;
2397 } 2397 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.h ('k') | chrome/browser/ui/panels/panel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698