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

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

Issue 6881073: Cleanup popup related browser navigation code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and merge with avi's popup block changes. Created 9 years, 7 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
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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 FadeForInstant(false); 1113 FadeForInstant(false);
1114 else 1114 else
1115 CancelInstantFade(); 1115 CancelInstantFade();
1116 } 1116 }
1117 } 1117 }
1118 1118
1119 gfx::Rect BrowserWindowGtk::GetInstantBounds() { 1119 gfx::Rect BrowserWindowGtk::GetInstantBounds() {
1120 return gtk_util::GetWidgetScreenBounds(contents_container_->widget()); 1120 return gtk_util::GetWidgetScreenBounds(contents_container_->widget());
1121 } 1121 }
1122 1122
1123 WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds(
1124 const gfx::Rect& bounds) {
1125 return NEW_POPUP;
1126 }
1127
1123 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { 1128 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
1124 new DownloadInProgressDialogGtk(browser()); 1129 new DownloadInProgressDialogGtk(browser());
1125 } 1130 }
1126 1131
1127 void BrowserWindowGtk::Observe(NotificationType type, 1132 void BrowserWindowGtk::Observe(NotificationType type,
1128 const NotificationSource& source, 1133 const NotificationSource& source,
1129 const NotificationDetails& details) { 1134 const NotificationDetails& details) {
1130 switch (type.value) { 1135 switch (type.value) {
1131 case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: 1136 case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
1132 MaybeShowBookmarkBar(true); 1137 MaybeShowBookmarkBar(true);
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2349 // are taken from the WMs' source code. 2354 // are taken from the WMs' source code.
2350 return (wm_name == "Blackbox" || 2355 return (wm_name == "Blackbox" ||
2351 wm_name == "compiz" || 2356 wm_name == "compiz" ||
2352 wm_name == "Compiz" || 2357 wm_name == "Compiz" ||
2353 wm_name == "e16" || // Enlightenment DR16 2358 wm_name == "e16" || // Enlightenment DR16
2354 wm_name == "Metacity" || 2359 wm_name == "Metacity" ||
2355 wm_name == "Mutter" || 2360 wm_name == "Mutter" ||
2356 wm_name == "Openbox" || 2361 wm_name == "Openbox" ||
2357 wm_name == "Xfwm4"); 2362 wm_name == "Xfwm4");
2358 } 2363 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698