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

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

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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/find_bar_host_browsertest.cc ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_titlebar.h" 5 #include "chrome/browser/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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "app/l10n_util.h" 13 #include "app/l10n_util.h"
14 #include "app/resource_bundle.h" 14 #include "app/resource_bundle.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/singleton.h" 16 #include "base/singleton.h"
17 #include "base/string_piece.h" 17 #include "base/string_piece.h"
18 #include "base/string_tokenizer.h" 18 #include "base/string_tokenizer.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "chrome/app/chrome_command_ids.h" 20 #include "chrome/app/chrome_command_ids.h"
21 #include "chrome/browser/browser.h"
22 #include "chrome/browser/encoding_menu_controller.h" 21 #include "chrome/browser/encoding_menu_controller.h"
23 #include "chrome/browser/gtk/accelerators_gtk.h" 22 #include "chrome/browser/gtk/accelerators_gtk.h"
24 #include "chrome/browser/gtk/browser_window_gtk.h" 23 #include "chrome/browser/gtk/browser_window_gtk.h"
25 #include "chrome/browser/gtk/custom_button.h" 24 #include "chrome/browser/gtk/custom_button.h"
26 #if defined(USE_GCONF) 25 #if defined(USE_GCONF)
27 #include "chrome/browser/gtk/gconf_titlebar_listener.h" 26 #include "chrome/browser/gtk/gconf_titlebar_listener.h"
28 #endif 27 #endif
29 #include "chrome/browser/gtk/gtk_theme_provider.h" 28 #include "chrome/browser/gtk/gtk_theme_provider.h"
30 #include "chrome/browser/gtk/gtk_util.h" 29 #include "chrome/browser/gtk/gtk_util.h"
31 #include "chrome/browser/gtk/menu_gtk.h" 30 #include "chrome/browser/gtk/menu_gtk.h"
32 #include "chrome/browser/gtk/nine_box.h" 31 #include "chrome/browser/gtk/nine_box.h"
33 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" 32 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
34 #include "chrome/browser/prefs/pref_service.h" 33 #include "chrome/browser/prefs/pref_service.h"
35 #include "chrome/browser/profile.h" 34 #include "chrome/browser/profile.h"
36 #include "chrome/browser/tab_contents/tab_contents.h" 35 #include "chrome/browser/tab_contents/tab_contents.h"
36 #include "chrome/browser/ui/browser.h"
37 #include "chrome/browser/wrench_menu_model.h" 37 #include "chrome/browser/wrench_menu_model.h"
38 #include "chrome/common/notification_service.h" 38 #include "chrome/common/notification_service.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "gfx/gtk_util.h" 40 #include "gfx/gtk_util.h"
41 #include "gfx/skbitmap_operations.h" 41 #include "gfx/skbitmap_operations.h"
42 #include "grit/app_resources.h" 42 #include "grit/app_resources.h"
43 #include "grit/generated_resources.h" 43 #include "grit/generated_resources.h"
44 #include "grit/theme_resources.h" 44 #include "grit/theme_resources.h"
45 45
46 namespace { 46 namespace {
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 menus::SimpleMenuModel::Delegate* delegate) 937 menus::SimpleMenuModel::Delegate* delegate)
938 : SimpleMenuModel(delegate) { 938 : SimpleMenuModel(delegate) {
939 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); 939 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
940 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); 940 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
941 AddSeparator(); 941 AddSeparator();
942 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 942 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
943 AddSeparator(); 943 AddSeparator();
944 AddCheckItemWithStringId(kShowWindowDecorationsCommand, 944 AddCheckItemWithStringId(kShowWindowDecorationsCommand,
945 IDS_SHOW_WINDOW_DECORATIONS_MENU); 945 IDS_SHOW_WINDOW_DECORATIONS_MENU);
946 } 946 }
OLDNEW
« no previous file with comments | « chrome/browser/find_bar_host_browsertest.cc ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698