| 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_titlebar.h" | 5 #include "chrome/browser/ui/gtk/browser_titlebar.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "chrome/browser/ui/gtk/unity_service.h" | 42 #include "chrome/browser/ui/gtk/unity_service.h" |
| 43 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 43 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 44 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 44 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 45 #include "chrome/common/chrome_notification_types.h" | 45 #include "chrome/common/chrome_notification_types.h" |
| 46 #include "chrome/common/chrome_switches.h" | 46 #include "chrome/common/chrome_switches.h" |
| 47 #include "chrome/common/pref_names.h" | 47 #include "chrome/common/pref_names.h" |
| 48 #include "content/public/browser/notification_service.h" | 48 #include "content/public/browser/notification_service.h" |
| 49 #include "content/public/browser/web_contents.h" | 49 #include "content/public/browser/web_contents.h" |
| 50 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
| 51 #include "grit/theme_resources.h" | 51 #include "grit/theme_resources.h" |
| 52 #include "grit/theme_resources_standard.h" | |
| 53 #include "grit/ui_resources.h" | 52 #include "grit/ui_resources.h" |
| 54 #include "grit/ui_resources_standard.h" | |
| 55 #include "ui/base/gtk/gtk_hig_constants.h" | 53 #include "ui/base/gtk/gtk_hig_constants.h" |
| 56 #include "ui/base/l10n/l10n_util.h" | 54 #include "ui/base/l10n/l10n_util.h" |
| 57 #include "ui/base/resource/resource_bundle.h" | 55 #include "ui/base/resource/resource_bundle.h" |
| 58 #include "ui/base/x/active_window_watcher_x.h" | 56 #include "ui/base/x/active_window_watcher_x.h" |
| 59 #include "ui/gfx/gtk_util.h" | 57 #include "ui/gfx/gtk_util.h" |
| 60 #include "ui/gfx/image/image.h" | 58 #include "ui/gfx/image/image.h" |
| 61 | 59 |
| 62 using content::WebContents; | 60 using content::WebContents; |
| 63 | 61 |
| 64 namespace { | 62 namespace { |
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 ui::SimpleMenuModel::Delegate* delegate) | 1051 ui::SimpleMenuModel::Delegate* delegate) |
| 1054 : SimpleMenuModel(delegate) { | 1052 : SimpleMenuModel(delegate) { |
| 1055 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1053 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
| 1056 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1054 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 1057 AddSeparator(); | 1055 AddSeparator(); |
| 1058 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1056 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 1059 AddSeparator(); | 1057 AddSeparator(); |
| 1060 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1058 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
| 1061 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1059 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
| 1062 } | 1060 } |
| OLD | NEW |