| 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 <dlfcn.h> | 7 #include <dlfcn.h> |
| 8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 sum += bookmark_bar_->GetHeight(); | 1113 sum += bookmark_bar_->GetHeight(); |
| 1114 if (download_shelf_.get() && download_shelf_->IsClosing()) | 1114 if (download_shelf_.get() && download_shelf_->IsClosing()) |
| 1115 sum += download_shelf_->GetHeight(); | 1115 sum += download_shelf_->GetHeight(); |
| 1116 return sum; | 1116 return sum; |
| 1117 } | 1117 } |
| 1118 | 1118 |
| 1119 void BrowserWindowGtk::WebContentsFocused(WebContents* contents) { | 1119 void BrowserWindowGtk::WebContentsFocused(WebContents* contents) { |
| 1120 NOTIMPLEMENTED(); | 1120 NOTIMPLEMENTED(); |
| 1121 } | 1121 } |
| 1122 | 1122 |
| 1123 void BrowserWindowGtk::ShowPageInfo(Profile* profile, | 1123 void BrowserWindowGtk::ShowPageInfo(content::WebContents* web_contents, |
| 1124 const GURL& url, | 1124 const GURL& url, |
| 1125 const SSLStatus& ssl, | 1125 const SSLStatus& ssl, |
| 1126 bool show_history) { | 1126 bool show_history) { |
| 1127 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history, | 1127 browser::ShowPageInfoBubble(window_, web_contents, url, ssl, show_history, |
| 1128 browser_.get()); | 1128 browser_.get()); |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 void BrowserWindowGtk::ShowWebsiteSettings( | 1131 void BrowserWindowGtk::ShowWebsiteSettings( |
| 1132 Profile* profile, | 1132 Profile* profile, |
| 1133 TabContents* tab_contents, | 1133 TabContents* tab_contents, |
| 1134 const GURL& url, | 1134 const GURL& url, |
| 1135 const content::SSLStatus& ssl, | 1135 const content::SSLStatus& ssl, |
| 1136 bool show_history) { | 1136 bool show_history) { |
| 1137 WebsiteSettingsPopupGtk::Show(GetNativeWindow(), profile, | 1137 WebsiteSettingsPopupGtk::Show(GetNativeWindow(), profile, |
| (...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2608 wm_type == ui::WM_OPENBOX || | 2608 wm_type == ui::WM_OPENBOX || |
| 2609 wm_type == ui::WM_XFWM4); | 2609 wm_type == ui::WM_XFWM4); |
| 2610 } | 2610 } |
| 2611 | 2611 |
| 2612 // static | 2612 // static |
| 2613 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2613 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2614 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2614 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2615 browser_window_gtk->Init(); | 2615 browser_window_gtk->Init(); |
| 2616 return browser_window_gtk; | 2616 return browser_window_gtk; |
| 2617 } | 2617 } |
| OLD | NEW |