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

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: Fix Popup tests for ChromeOS. Created 9 years, 8 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 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 FadeForInstant(false); 1095 FadeForInstant(false);
1096 else 1096 else
1097 CancelInstantFade(); 1097 CancelInstantFade();
1098 } 1098 }
1099 } 1099 }
1100 1100
1101 gfx::Rect BrowserWindowGtk::GetInstantBounds() { 1101 gfx::Rect BrowserWindowGtk::GetInstantBounds() {
1102 return gtk_util::GetWidgetScreenBounds(contents_container_->widget()); 1102 return gtk_util::GetWidgetScreenBounds(contents_container_->widget());
1103 } 1103 }
1104 1104
1105 void BrowserWindowGtk::AdjustNavigateParams(browser::NavigateParams* params) {
1106 }
1107
1105 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { 1108 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
1106 new DownloadInProgressDialogGtk(browser()); 1109 new DownloadInProgressDialogGtk(browser());
1107 } 1110 }
1108 1111
1109 void BrowserWindowGtk::Observe(NotificationType type, 1112 void BrowserWindowGtk::Observe(NotificationType type,
1110 const NotificationSource& source, 1113 const NotificationSource& source,
1111 const NotificationDetails& details) { 1114 const NotificationDetails& details) {
1112 switch (type.value) { 1115 switch (type.value) {
1113 case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: 1116 case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
1114 MaybeShowBookmarkBar(true); 1117 MaybeShowBookmarkBar(true);
(...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after
2329 // special-case the ones where the custom frame should be used. These names 2332 // special-case the ones where the custom frame should be used. These names
2330 // are taken from the WMs' source code. 2333 // are taken from the WMs' source code.
2331 return (wm_name == "Blackbox" || 2334 return (wm_name == "Blackbox" ||
2332 wm_name == "compiz" || 2335 wm_name == "compiz" ||
2333 wm_name == "e16" || // Enlightenment DR16 2336 wm_name == "e16" || // Enlightenment DR16
2334 wm_name == "Metacity" || 2337 wm_name == "Metacity" ||
2335 wm_name == "Mutter" || 2338 wm_name == "Mutter" ||
2336 wm_name == "Openbox" || 2339 wm_name == "Openbox" ||
2337 wm_name == "Xfwm4"); 2340 wm_name == "Xfwm4");
2338 } 2341 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698