| 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 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1076 // | 1076 // |
| 1077 // It's not necessary to care about the keyboard layout, as | 1077 // It's not necessary to care about the keyboard layout, as |
| 1078 // gtk_window_activate_key() takes care of it automatically. | 1078 // gtk_window_activate_key() takes care of it automatically. |
| 1079 int id = GetCustomCommandId(os_event); | 1079 int id = GetCustomCommandId(os_event); |
| 1080 if (id != -1) | 1080 if (id != -1) |
| 1081 ExecuteBrowserCommand(id); | 1081 ExecuteBrowserCommand(id); |
| 1082 else | 1082 else |
| 1083 gtk_window_activate_key(window_, os_event); | 1083 gtk_window_activate_key(window_, os_event); |
| 1084 } | 1084 } |
| 1085 | 1085 |
| 1086 void BrowserWindowGtk::ShowCreateShortcutsDialog(TabContents* tab_contents) { | 1086 void BrowserWindowGtk::ShowCreateWebAppShortcutsDialog( |
| 1087 CreateApplicationShortcutsDialogGtk::Show(window_, tab_contents); | 1087 TabContents* tab_contents) { |
| 1088 CreateWebApplicationShortcutsDialogGtk::Show(window_, tab_contents); |
| 1089 } |
| 1090 |
| 1091 void BrowserWindowGtk::ShowCreateChromeAppShortcutsDialog( |
| 1092 Profile* profile, const Extension* app) { |
| 1093 CreateChromeApplicationShortcutsDialogGtk::Show(window_, app); |
| 1088 } | 1094 } |
| 1089 | 1095 |
| 1090 void BrowserWindowGtk::Cut() { | 1096 void BrowserWindowGtk::Cut() { |
| 1091 gtk_util::DoCut(this); | 1097 gtk_util::DoCut(this); |
| 1092 } | 1098 } |
| 1093 | 1099 |
| 1094 void BrowserWindowGtk::Copy() { | 1100 void BrowserWindowGtk::Copy() { |
| 1095 gtk_util::DoCopy(this); | 1101 gtk_util::DoCopy(this); |
| 1096 } | 1102 } |
| 1097 | 1103 |
| (...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2225 // special-case the ones where the custom frame should be used. These names | 2231 // special-case the ones where the custom frame should be used. These names |
| 2226 // are taken from the WMs' source code. | 2232 // are taken from the WMs' source code. |
| 2227 return (wm_name == "Blackbox" || | 2233 return (wm_name == "Blackbox" || |
| 2228 wm_name == "compiz" || | 2234 wm_name == "compiz" || |
| 2229 wm_name == "e16" || // Enlightenment DR16 | 2235 wm_name == "e16" || // Enlightenment DR16 |
| 2230 wm_name == "Metacity" || | 2236 wm_name == "Metacity" || |
| 2231 wm_name == "Mutter" || | 2237 wm_name == "Mutter" || |
| 2232 wm_name == "Openbox" || | 2238 wm_name == "Openbox" || |
| 2233 wm_name == "Xfwm4"); | 2239 wm_name == "Xfwm4"); |
| 2234 } | 2240 } |
| OLD | NEW |