OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
43 #include "content/browser/tab_contents/tab_contents.h" | 43 #include "content/browser/tab_contents/tab_contents.h" |
44 #include "content/public/browser/notification_service.h" | 44 #include "content/public/browser/notification_service.h" |
45 #include "grit/generated_resources.h" | 45 #include "grit/generated_resources.h" |
46 #include "grit/theme_resources.h" | 46 #include "grit/theme_resources.h" |
47 #include "grit/theme_resources_standard.h" | 47 #include "grit/theme_resources_standard.h" |
48 #include "grit/ui_resources.h" | 48 #include "grit/ui_resources.h" |
49 #include "ui/base/gtk/gtk_hig_constants.h" | 49 #include "ui/base/gtk/gtk_hig_constants.h" |
50 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
51 #include "ui/base/resource/resource_bundle.h" | 51 #include "ui/base/resource/resource_bundle.h" |
| 52 #include "ui/base/x/active_window_watcher_x.h" |
52 #include "ui/gfx/gtk_util.h" | 53 #include "ui/gfx/gtk_util.h" |
53 #include "ui/gfx/image/image.h" | 54 #include "ui/gfx/image/image.h" |
54 #include "ui/gfx/skbitmap_operations.h" | 55 #include "ui/gfx/skbitmap_operations.h" |
55 | 56 |
56 namespace { | 57 namespace { |
57 | 58 |
58 // The space above the titlebars. | 59 // The space above the titlebars. |
59 const int kTitlebarHeight = 14; | 60 const int kTitlebarHeight = 14; |
60 | 61 |
61 // The thickness in pixels of the tab border. | 62 // The thickness in pixels of the tab border. |
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1125 ui::SimpleMenuModel::Delegate* delegate) | 1126 ui::SimpleMenuModel::Delegate* delegate) |
1126 : SimpleMenuModel(delegate) { | 1127 : SimpleMenuModel(delegate) { |
1127 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1128 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
1128 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1129 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
1129 AddSeparator(); | 1130 AddSeparator(); |
1130 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1131 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
1131 AddSeparator(); | 1132 AddSeparator(); |
1132 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1133 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
1133 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1134 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
1134 } | 1135 } |
OLD | NEW |