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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1124 } | 1124 } |
1125 | 1125 |
1126 void BrowserWindowGtk::WebContentsFocused(WebContents* contents) { | 1126 void BrowserWindowGtk::WebContentsFocused(WebContents* contents) { |
1127 NOTIMPLEMENTED(); | 1127 NOTIMPLEMENTED(); |
1128 } | 1128 } |
1129 | 1129 |
1130 void BrowserWindowGtk::ShowPageInfo(Profile* profile, | 1130 void BrowserWindowGtk::ShowPageInfo(Profile* profile, |
1131 const GURL& url, | 1131 const GURL& url, |
1132 const SSLStatus& ssl, | 1132 const SSLStatus& ssl, |
1133 bool show_history) { | 1133 bool show_history) { |
1134 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history); | 1134 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history, |
| 1135 browser_.get()); |
1135 } | 1136 } |
1136 | 1137 |
1137 void BrowserWindowGtk::ShowWebsiteSettings( | 1138 void BrowserWindowGtk::ShowWebsiteSettings( |
1138 Profile* profile, | 1139 Profile* profile, |
1139 TabContentsWrapper* tab_contents_wrapper, | 1140 TabContentsWrapper* tab_contents_wrapper, |
1140 const GURL& url, | 1141 const GURL& url, |
1141 const content::SSLStatus& ssl, | 1142 const content::SSLStatus& ssl, |
1142 bool show_history) { | 1143 bool show_history) { |
1143 WebsiteSettings::Show(GetNativeHandle(), | 1144 WebsiteSettings::Show(GetNativeHandle(), |
1144 profile, | 1145 profile, |
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2600 wm_type == ui::WM_OPENBOX || | 2601 wm_type == ui::WM_OPENBOX || |
2601 wm_type == ui::WM_XFWM4); | 2602 wm_type == ui::WM_XFWM4); |
2602 } | 2603 } |
2603 | 2604 |
2604 // static | 2605 // static |
2605 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2606 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2606 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2607 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2607 browser_window_gtk->Init(); | 2608 browser_window_gtk->Init(); |
2608 return browser_window_gtk; | 2609 return browser_window_gtk; |
2609 } | 2610 } |
OLD | NEW |