| 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 17 matching lines...) Expand all Loading... |
| 28 #endif | 28 #endif |
| 29 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" | 29 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" |
| 30 #include "chrome/browser/ui/gtk/gtk_util.h" | 30 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 31 #include "chrome/browser/ui/gtk/menu_gtk.h" | 31 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 32 #include "chrome/browser/ui/gtk/nine_box.h" | 32 #include "chrome/browser/ui/gtk/nine_box.h" |
| 33 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 33 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| 34 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 34 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 35 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 35 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 36 #include "chrome/common/notification_service.h" | 36 #include "chrome/common/notification_service.h" |
| 37 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
| 38 #include "gfx/gtk_util.h" | |
| 39 #include "gfx/skbitmap_operations.h" | |
| 40 #include "grit/app_resources.h" | 38 #include "grit/app_resources.h" |
| 41 #include "grit/generated_resources.h" | 39 #include "grit/generated_resources.h" |
| 42 #include "grit/theme_resources.h" | 40 #include "grit/theme_resources.h" |
| 43 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
| 44 #include "ui/base/resource/resource_bundle.h" | 42 #include "ui/base/resource/resource_bundle.h" |
| 43 #include "ui/gfx/gtk_util.h" |
| 44 #include "ui/gfx/skbitmap_operations.h" |
| 45 | 45 |
| 46 namespace { | 46 namespace { |
| 47 | 47 |
| 48 // The space above the titlebars. | 48 // The space above the titlebars. |
| 49 const int kTitlebarHeight = 14; | 49 const int kTitlebarHeight = 14; |
| 50 | 50 |
| 51 // The thickness in pixels of the tab border. | 51 // The thickness in pixels of the tab border. |
| 52 const int kTabOuterThickness = 1; | 52 const int kTabOuterThickness = 1; |
| 53 | 53 |
| 54 // Amount to offset the tab images relative to the background. | 54 // Amount to offset the tab images relative to the background. |
| (...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 ui::SimpleMenuModel::Delegate* delegate) | 939 ui::SimpleMenuModel::Delegate* delegate) |
| 940 : SimpleMenuModel(delegate) { | 940 : SimpleMenuModel(delegate) { |
| 941 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 941 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
| 942 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 942 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 943 AddSeparator(); | 943 AddSeparator(); |
| 944 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 944 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 945 AddSeparator(); | 945 AddSeparator(); |
| 946 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 946 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
| 947 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 947 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
| 948 } | 948 } |
| OLD | NEW |