Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 160084: Chaos geolocation demo, non-WebKit part. Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.h ('k') | chrome/browser/gtk/gtk_skinny_button.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include <X11/XF86keysym.h> 8 #include <X11/XF86keysym.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/browser.h" 28 #include "chrome/browser/browser.h"
29 #include "chrome/browser/browser_list.h" 29 #include "chrome/browser/browser_list.h"
30 #include "chrome/browser/browser_process.h" 30 #include "chrome/browser/browser_process.h"
31 #include "chrome/browser/browser_theme_provider.h" 31 #include "chrome/browser/browser_theme_provider.h"
32 #include "chrome/browser/debugger/devtools_window.h" 32 #include "chrome/browser/debugger/devtools_window.h"
33 #include "chrome/browser/download/download_item_model.h" 33 #include "chrome/browser/download/download_item_model.h"
34 #include "chrome/browser/download/download_manager.h" 34 #include "chrome/browser/download/download_manager.h"
35 #include "chrome/browser/find_bar_controller.h" 35 #include "chrome/browser/find_bar_controller.h"
36 #include "chrome/browser/gtk/about_chrome_dialog.h" 36 #include "chrome/browser/gtk/about_chrome_dialog.h"
37 #include "chrome/browser/gtk/active_window_watcher.h" 37 #include "chrome/browser/gtk/active_window_watcher.h"
38 #include "chrome/browser/gtk/api_permissions_panel_gtk.h"
38 #include "chrome/browser/gtk/bookmark_bar_gtk.h" 39 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
39 #include "chrome/browser/gtk/bookmark_manager_gtk.h" 40 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
40 #include "chrome/browser/gtk/browser_titlebar.h" 41 #include "chrome/browser/gtk/browser_titlebar.h"
41 #include "chrome/browser/gtk/browser_toolbar_gtk.h" 42 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
42 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" 43 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
43 #include "chrome/browser/gtk/download_shelf_gtk.h" 44 #include "chrome/browser/gtk/download_shelf_gtk.h"
44 #include "chrome/browser/gtk/edit_search_engine_dialog.h" 45 #include "chrome/browser/gtk/edit_search_engine_dialog.h"
45 #include "chrome/browser/gtk/extension_shelf_gtk.h" 46 #include "chrome/browser/gtk/extension_shelf_gtk.h"
46 #include "chrome/browser/gtk/find_bar_gtk.h" 47 #include "chrome/browser/gtk/find_bar_gtk.h"
47 #include "chrome/browser/gtk/go_button_gtk.h" 48 #include "chrome/browser/gtk/go_button_gtk.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, 276 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK },
276 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, 277 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK },
277 278
278 #if defined(OS_CHROMEOS) 279 #if defined(OS_CHROMEOS)
279 { GDK_f, IDC_FULLSCREEN, 280 { GDK_f, IDC_FULLSCREEN,
280 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) }, 281 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) },
281 { GDK_Delete, IDC_TASK_MANAGER, 282 { GDK_Delete, IDC_TASK_MANAGER,
282 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) }, 283 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) },
283 { GDK_comma, IDC_CONTROL_PANEL, GdkModifierType(GDK_CONTROL_MASK) }, 284 { GDK_comma, IDC_CONTROL_PANEL, GdkModifierType(GDK_CONTROL_MASK) },
284 #endif 285 #endif
286 { GDK_Escape, IDC_API_PERMISSIONS_PANEL,
287 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
285 }; 288 };
286 289
287 int GetCommandId(guint accel_key, GdkModifierType modifier) { 290 int GetCommandId(guint accel_key, GdkModifierType modifier) {
288 // Bug 9806: If capslock is on, we will get a capital letter as accel_key. 291 // Bug 9806: If capslock is on, we will get a capital letter as accel_key.
289 accel_key = gdk_keyval_to_lower(accel_key); 292 accel_key = gdk_keyval_to_lower(accel_key);
290 // Filter modifier to only include accelerator modifiers. 293 // Filter modifier to only include accelerator modifiers.
291 modifier = static_cast<GdkModifierType>( 294 modifier = static_cast<GdkModifierType>(
292 modifier & gtk_accelerator_get_default_mod_mask()); 295 modifier & gtk_accelerator_get_default_mod_mask());
293 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { 296 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
294 if (kAcceleratorMap[i].keyval == accel_key && 297 if (kAcceleratorMap[i].keyval == accel_key &&
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 } 899 }
897 900
898 void BrowserWindowGtk::ShowAboutChromeDialog() { 901 void BrowserWindowGtk::ShowAboutChromeDialog() {
899 ShowAboutDialogForProfile(window_, browser_->profile()); 902 ShowAboutDialogForProfile(window_, browser_->profile());
900 } 903 }
901 904
902 void BrowserWindowGtk::ShowTaskManager() { 905 void BrowserWindowGtk::ShowTaskManager() {
903 TaskManagerGtk::Show(); 906 TaskManagerGtk::Show();
904 } 907 }
905 908
909 void BrowserWindowGtk::ShowApiPermissionsPanel() {
910 ApiPermissionsPanelGtk::Show();
911 }
912
906 void BrowserWindowGtk::ShowBookmarkManager() { 913 void BrowserWindowGtk::ShowBookmarkManager() {
907 BookmarkManagerGtk::Show(browser_->profile()); 914 BookmarkManagerGtk::Show(browser_->profile());
908 } 915 }
909 916
910 void BrowserWindowGtk::ShowBookmarkBubble(const GURL& url, 917 void BrowserWindowGtk::ShowBookmarkBubble(const GURL& url,
911 bool already_bookmarked) { 918 bool already_bookmarked) {
912 toolbar_->star()->ShowStarBubble(url, !already_bookmarked); 919 toolbar_->star()->ShowStarBubble(url, !already_bookmarked);
913 } 920 }
914 921
915 bool BrowserWindowGtk::IsDownloadShelfVisible() const { 922 bool BrowserWindowGtk::IsDownloadShelfVisible() const {
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1967 // are taken from the WMs' source code. 1974 // are taken from the WMs' source code.
1968 return (wm_name == "Blackbox" || 1975 return (wm_name == "Blackbox" ||
1969 wm_name == "compiz" || 1976 wm_name == "compiz" ||
1970 wm_name == "e16" || // Enlightenment DR16 1977 wm_name == "e16" || // Enlightenment DR16
1971 wm_name == "Fluxbox" || 1978 wm_name == "Fluxbox" ||
1972 wm_name == "KWin" || 1979 wm_name == "KWin" ||
1973 wm_name == "Metacity" || 1980 wm_name == "Metacity" ||
1974 wm_name == "Openbox" || 1981 wm_name == "Openbox" ||
1975 wm_name == "Xfwm4"); 1982 wm_name == "Xfwm4");
1976 } 1983 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.h ('k') | chrome/browser/gtk/gtk_skinny_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698