OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/gtk/browser_window_gtk.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1012 } | 1012 } |
1013 | 1013 |
1014 void BrowserWindowGtk::TabContentsFocused(TabContents* tab_contents) { | 1014 void BrowserWindowGtk::TabContentsFocused(TabContents* tab_contents) { |
1015 NOTIMPLEMENTED(); | 1015 NOTIMPLEMENTED(); |
1016 } | 1016 } |
1017 | 1017 |
1018 void BrowserWindowGtk::ShowPageInfo(Profile* profile, | 1018 void BrowserWindowGtk::ShowPageInfo(Profile* profile, |
1019 const GURL& url, | 1019 const GURL& url, |
1020 const NavigationEntry::SSLStatus& ssl, | 1020 const NavigationEntry::SSLStatus& ssl, |
1021 bool show_history) { | 1021 bool show_history) { |
1022 browser::ShowPageInfo(window_, profile, url, ssl, show_history); | 1022 const CommandLine* command_line(CommandLine::ForCurrentProcess()); |
| 1023 if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble)) |
| 1024 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history); |
| 1025 else |
| 1026 browser::ShowPageInfo(window_, profile, url, ssl, show_history); |
1023 } | 1027 } |
1024 | 1028 |
1025 void BrowserWindowGtk::ShowAppMenu() { | 1029 void BrowserWindowGtk::ShowAppMenu() { |
1026 toolbar_->ShowAppMenu(); | 1030 toolbar_->ShowAppMenu(); |
1027 } | 1031 } |
1028 | 1032 |
1029 bool BrowserWindowGtk::PreHandleKeyboardEvent( | 1033 bool BrowserWindowGtk::PreHandleKeyboardEvent( |
1030 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { | 1034 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { |
1031 GdkEventKey* os_event = event.os_event; | 1035 GdkEventKey* os_event = event.os_event; |
1032 | 1036 |
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2165 // special-case the ones where the custom frame should be used. These names | 2169 // special-case the ones where the custom frame should be used. These names |
2166 // are taken from the WMs' source code. | 2170 // are taken from the WMs' source code. |
2167 return (wm_name == "Blackbox" || | 2171 return (wm_name == "Blackbox" || |
2168 wm_name == "compiz" || | 2172 wm_name == "compiz" || |
2169 wm_name == "e16" || // Enlightenment DR16 | 2173 wm_name == "e16" || // Enlightenment DR16 |
2170 wm_name == "Metacity" || | 2174 wm_name == "Metacity" || |
2171 wm_name == "Mutter" || | 2175 wm_name == "Mutter" || |
2172 wm_name == "Openbox" || | 2176 wm_name == "Openbox" || |
2173 wm_name == "Xfwm4"); | 2177 wm_name == "Xfwm4"); |
2174 } | 2178 } |
OLD | NEW |