| 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 793 | 793 |
| 794 void BrowserWindowGtk::FlashFrame(bool flash) { | 794 void BrowserWindowGtk::FlashFrame(bool flash) { |
| 795 // May not be respected by all window managers. | 795 // May not be respected by all window managers. |
| 796 gtk_window_set_urgency_hint(window_, flash); | 796 gtk_window_set_urgency_hint(window_, flash); |
| 797 } | 797 } |
| 798 | 798 |
| 799 bool BrowserWindowGtk::IsAlwaysOnTop() const { | 799 bool BrowserWindowGtk::IsAlwaysOnTop() const { |
| 800 return false; | 800 return false; |
| 801 } | 801 } |
| 802 | 802 |
| 803 gfx::NativeWindow BrowserWindowGtk::GetNativeHandle() { | 803 gfx::NativeWindow BrowserWindowGtk::GetNativeWindow() { |
| 804 return window_; | 804 return window_; |
| 805 } | 805 } |
| 806 | 806 |
| 807 BrowserWindowTesting* BrowserWindowGtk::GetBrowserWindowTesting() { | 807 BrowserWindowTesting* BrowserWindowGtk::GetBrowserWindowTesting() { |
| 808 NOTIMPLEMENTED(); | 808 NOTIMPLEMENTED(); |
| 809 return NULL; | 809 return NULL; |
| 810 } | 810 } |
| 811 | 811 |
| 812 StatusBubble* BrowserWindowGtk::GetStatusBubble() { | 812 StatusBubble* BrowserWindowGtk::GetStatusBubble() { |
| 813 return status_bubble_.get(); | 813 return status_bubble_.get(); |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1127 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history, | 1127 browser::ShowPageInfoBubble(window_, profile, 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 TabContentsWrapper* tab_contents_wrapper, | 1133 TabContentsWrapper* tab_contents_wrapper, |
| 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(GetNativeHandle(), profile, | 1137 WebsiteSettingsPopupGtk::Show(GetNativeWindow(), profile, |
| 1138 tab_contents_wrapper, url, ssl); | 1138 tab_contents_wrapper, url, ssl); |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 void BrowserWindowGtk::ShowAppMenu() { | 1141 void BrowserWindowGtk::ShowAppMenu() { |
| 1142 toolbar_->ShowAppMenu(); | 1142 toolbar_->ShowAppMenu(); |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 bool BrowserWindowGtk::PreHandleKeyboardEvent( | 1145 bool BrowserWindowGtk::PreHandleKeyboardEvent( |
| 1146 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { | 1146 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { |
| 1147 GdkEventKey* os_event = &event.os_event->key; | 1147 GdkEventKey* os_event = &event.os_event->key; |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 new PasswordGenerationBubbleGtk(rect, | 1297 new PasswordGenerationBubbleGtk(rect, |
| 1298 form, | 1298 form, |
| 1299 web_contents->GetContentNativeView(), | 1299 web_contents->GetContentNativeView(), |
| 1300 browser()->profile(), | 1300 browser()->profile(), |
| 1301 web_contents->GetRenderViewHost(), | 1301 web_contents->GetRenderViewHost(), |
| 1302 password_generator, | 1302 password_generator, |
| 1303 tab_contents->password_manager()); | 1303 tab_contents->password_manager()); |
| 1304 } | 1304 } |
| 1305 | 1305 |
| 1306 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { | 1306 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { |
| 1307 DownloadInProgressDialogGtk::Show(browser(), GetNativeHandle()); | 1307 DownloadInProgressDialogGtk::Show(browser(), GetNativeWindow()); |
| 1308 } | 1308 } |
| 1309 | 1309 |
| 1310 void BrowserWindowGtk::Observe(int type, | 1310 void BrowserWindowGtk::Observe(int type, |
| 1311 const content::NotificationSource& source, | 1311 const content::NotificationSource& source, |
| 1312 const content::NotificationDetails& details) { | 1312 const content::NotificationDetails& details) { |
| 1313 switch (type) { | 1313 switch (type) { |
| 1314 case chrome::NOTIFICATION_PREF_CHANGED: { | 1314 case chrome::NOTIFICATION_PREF_CHANGED: { |
| 1315 std::string* pref_name = content::Details<std::string>(details).ptr(); | 1315 std::string* pref_name = content::Details<std::string>(details).ptr(); |
| 1316 if (*pref_name == prefs::kUseCustomChromeFrame) { | 1316 if (*pref_name == prefs::kUseCustomChromeFrame) { |
| 1317 UpdateCustomFrame(); | 1317 UpdateCustomFrame(); |
| (...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2602 wm_type == ui::WM_OPENBOX || | 2602 wm_type == ui::WM_OPENBOX || |
| 2603 wm_type == ui::WM_XFWM4); | 2603 wm_type == ui::WM_XFWM4); |
| 2604 } | 2604 } |
| 2605 | 2605 |
| 2606 // static | 2606 // static |
| 2607 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2607 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2608 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2608 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2609 browser_window_gtk->Init(); | 2609 browser_window_gtk->Init(); |
| 2610 return browser_window_gtk; | 2610 return browser_window_gtk; |
| 2611 } | 2611 } |
| OLD | NEW |