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