| 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 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1215 gtk_window_activate_key(window_, os_event); | 1215 gtk_window_activate_key(window_, os_event); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 void BrowserWindowGtk::ShowCreateWebAppShortcutsDialog( | 1218 void BrowserWindowGtk::ShowCreateWebAppShortcutsDialog( |
| 1219 TabContentsWrapper* tab_contents) { | 1219 TabContentsWrapper* tab_contents) { |
| 1220 CreateWebApplicationShortcutsDialogGtk::Show(window_, tab_contents); | 1220 CreateWebApplicationShortcutsDialogGtk::Show(window_, tab_contents); |
| 1221 } | 1221 } |
| 1222 | 1222 |
| 1223 void BrowserWindowGtk::ShowCreateChromeAppShortcutsDialog( | 1223 void BrowserWindowGtk::ShowCreateChromeAppShortcutsDialog( |
| 1224 Profile* profile, const Extension* app) { | 1224 Profile* profile, const Extension* app) { |
| 1225 CreateChromeApplicationShortcutsDialogGtk::Show(window_, app); | 1225 CreateChromeApplicationShortcutsDialogGtk::Show(window_, profile, app); |
| 1226 } | 1226 } |
| 1227 | 1227 |
| 1228 void BrowserWindowGtk::Cut() { | 1228 void BrowserWindowGtk::Cut() { |
| 1229 gtk_util::DoCut(this); | 1229 gtk_util::DoCut(this); |
| 1230 } | 1230 } |
| 1231 | 1231 |
| 1232 void BrowserWindowGtk::Copy() { | 1232 void BrowserWindowGtk::Copy() { |
| 1233 gtk_util::DoCopy(this); | 1233 gtk_util::DoCopy(this); |
| 1234 } | 1234 } |
| 1235 | 1235 |
| (...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2596 wm_type == ui::WM_OPENBOX || | 2596 wm_type == ui::WM_OPENBOX || |
| 2597 wm_type == ui::WM_XFWM4); | 2597 wm_type == ui::WM_XFWM4); |
| 2598 } | 2598 } |
| 2599 | 2599 |
| 2600 // static | 2600 // static |
| 2601 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2601 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2602 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2602 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2603 browser_window_gtk->Init(); | 2603 browser_window_gtk->Init(); |
| 2604 return browser_window_gtk; | 2604 return browser_window_gtk; |
| 2605 } | 2605 } |
| OLD | NEW |