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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1017 | 1017 |
1018 void BrowserWindowGtk::TabContentsFocused(TabContents* tab_contents) { | 1018 void BrowserWindowGtk::TabContentsFocused(TabContents* tab_contents) { |
1019 NOTIMPLEMENTED(); | 1019 NOTIMPLEMENTED(); |
1020 } | 1020 } |
1021 | 1021 |
1022 void BrowserWindowGtk::ShowPageInfo(Profile* profile, | 1022 void BrowserWindowGtk::ShowPageInfo(Profile* profile, |
1023 const GURL& url, | 1023 const GURL& url, |
1024 const NavigationEntry::SSLStatus& ssl, | 1024 const NavigationEntry::SSLStatus& ssl, |
1025 bool show_history) { | 1025 bool show_history) { |
1026 const CommandLine* command_line(CommandLine::ForCurrentProcess()); | 1026 const CommandLine* command_line(CommandLine::ForCurrentProcess()); |
1027 if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble)) | 1027 if (!command_line->HasSwitch(switches::kDisableNewPageInfoBubble)) |
1028 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history); | 1028 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history); |
1029 else | 1029 else |
1030 browser::ShowPageInfo(window_, profile, url, ssl, show_history); | 1030 browser::ShowPageInfo(window_, profile, url, ssl, show_history); |
1031 } | 1031 } |
1032 | 1032 |
1033 void BrowserWindowGtk::ShowAppMenu() { | 1033 void BrowserWindowGtk::ShowAppMenu() { |
1034 toolbar_->ShowAppMenu(); | 1034 toolbar_->ShowAppMenu(); |
1035 } | 1035 } |
1036 | 1036 |
1037 bool BrowserWindowGtk::PreHandleKeyboardEvent( | 1037 bool BrowserWindowGtk::PreHandleKeyboardEvent( |
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2184 // special-case the ones where the custom frame should be used. These names | 2184 // special-case the ones where the custom frame should be used. These names |
2185 // are taken from the WMs' source code. | 2185 // are taken from the WMs' source code. |
2186 return (wm_name == "Blackbox" || | 2186 return (wm_name == "Blackbox" || |
2187 wm_name == "compiz" || | 2187 wm_name == "compiz" || |
2188 wm_name == "e16" || // Enlightenment DR16 | 2188 wm_name == "e16" || // Enlightenment DR16 |
2189 wm_name == "Metacity" || | 2189 wm_name == "Metacity" || |
2190 wm_name == "Mutter" || | 2190 wm_name == "Mutter" || |
2191 wm_name == "Openbox" || | 2191 wm_name == "Openbox" || |
2192 wm_name == "Xfwm4"); | 2192 wm_name == "Xfwm4"); |
2193 } | 2193 } |
OLD | NEW |