| 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 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1218 // | 1218 // |
| 1219 // It's not necessary to care about the keyboard layout, as | 1219 // It's not necessary to care about the keyboard layout, as |
| 1220 // gtk_window_activate_key() takes care of it automatically. | 1220 // gtk_window_activate_key() takes care of it automatically. |
| 1221 int id = GetCustomCommandId(os_event); | 1221 int id = GetCustomCommandId(os_event); |
| 1222 if (id != -1) | 1222 if (id != -1) |
| 1223 chrome::ExecuteCommand(browser_.get(), id); | 1223 chrome::ExecuteCommand(browser_.get(), id); |
| 1224 else | 1224 else |
| 1225 gtk_window_activate_key(window_, os_event); | 1225 gtk_window_activate_key(window_, os_event); |
| 1226 } | 1226 } |
| 1227 | 1227 |
| 1228 void BrowserWindowGtk::ShowCreateWebAppShortcutsDialog( | |
| 1229 TabContents* tab_contents) { | |
| 1230 CreateWebApplicationShortcutsDialogGtk::Show(window_, tab_contents); | |
| 1231 } | |
| 1232 | |
| 1233 void BrowserWindowGtk::ShowCreateChromeAppShortcutsDialog( | 1228 void BrowserWindowGtk::ShowCreateChromeAppShortcutsDialog( |
| 1234 Profile* profile, const extensions::Extension* app) { | 1229 Profile* profile, const extensions::Extension* app) { |
| 1235 CreateChromeApplicationShortcutsDialogGtk::Show(window_, profile, app); | 1230 CreateChromeApplicationShortcutsDialogGtk::Show(window_, profile, app); |
| 1236 } | 1231 } |
| 1237 | 1232 |
| 1238 void BrowserWindowGtk::Cut() { | 1233 void BrowserWindowGtk::Cut() { |
| 1239 gtk_util::DoCut(this); | 1234 gtk_util::DoCut(this); |
| 1240 } | 1235 } |
| 1241 | 1236 |
| 1242 void BrowserWindowGtk::Copy() { | 1237 void BrowserWindowGtk::Copy() { |
| (...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2603 wm_type == ui::WM_OPENBOX || | 2598 wm_type == ui::WM_OPENBOX || |
| 2604 wm_type == ui::WM_XFWM4); | 2599 wm_type == ui::WM_XFWM4); |
| 2605 } | 2600 } |
| 2606 | 2601 |
| 2607 // static | 2602 // static |
| 2608 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2603 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2609 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2604 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2610 browser_window_gtk->Init(); | 2605 browser_window_gtk->Init(); |
| 2611 return browser_window_gtk; | 2606 return browser_window_gtk; |
| 2612 } | 2607 } |
| OLD | NEW |