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/global_menu_bar.h" | 5 #include "chrome/browser/ui/gtk/global_menu_bar.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_commands.h" | 15 #include "chrome/browser/ui/browser_commands.h" |
16 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 16 #include "chrome/browser/ui/gtk/accelerators_gtk.h" |
17 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 17 #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
18 #include "chrome/browser/ui/gtk/gtk_util.h" | 18 #include "chrome/browser/ui/gtk/gtk_util.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
| 21 #include "components/bookmarks/bookmark_pref_names.h" |
21 #include "content/public/browser/notification_details.h" | 22 #include "content/public/browser/notification_details.h" |
22 #include "content/public/browser/notification_source.h" | 23 #include "content/public/browser/notification_source.h" |
23 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
24 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" | 25 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" |
25 #include "ui/base/accelerators/platform_accelerator_gtk.h" | 26 #include "ui/base/accelerators/platform_accelerator_gtk.h" |
26 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" |
27 | 28 |
28 struct GlobalMenuBarCommand { | 29 struct GlobalMenuBarCommand { |
29 int str_id; | 30 int str_id; |
30 int command; | 31 int command; |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 } | 305 } |
305 } | 306 } |
306 | 307 |
307 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) { | 308 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) { |
308 if (block_activation_) | 309 if (block_activation_) |
309 return; | 310 return; |
310 | 311 |
311 int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id")); | 312 int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id")); |
312 chrome::ExecuteCommand(browser_, id); | 313 chrome::ExecuteCommand(browser_, id); |
313 } | 314 } |
OLD | NEW |