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

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

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 months 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
OLDNEW
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 20 matching lines...) Expand all
31 #include "chrome/browser/ui/gtk/nine_box.h" 31 #include "chrome/browser/ui/gtk/nine_box.h"
32 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" 32 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
33 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 33 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
34 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 34 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "content/browser/tab_contents/tab_contents.h" 36 #include "content/browser/tab_contents/tab_contents.h"
37 #include "content/common/notification_service.h" 37 #include "content/common/notification_service.h"
38 #include "grit/app_resources.h" 38 #include "grit/app_resources.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 40 #include "grit/theme_resources.h"
41 #include "grit/theme_resources_standard.h"
41 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
43 #include "ui/gfx/gtk_util.h" 44 #include "ui/gfx/gtk_util.h"
44 #include "ui/gfx/skbitmap_operations.h" 45 #include "ui/gfx/skbitmap_operations.h"
45 46
46 namespace { 47 namespace {
47 48
48 // The space above the titlebars. 49 // The space above the titlebars.
49 const int kTitlebarHeight = 14; 50 const int kTitlebarHeight = 14;
50 51
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 ui::SimpleMenuModel::Delegate* delegate) 941 ui::SimpleMenuModel::Delegate* delegate)
941 : SimpleMenuModel(delegate) { 942 : SimpleMenuModel(delegate) {
942 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); 943 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
943 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); 944 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
944 AddSeparator(); 945 AddSeparator();
945 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 946 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
946 AddSeparator(); 947 AddSeparator();
947 AddCheckItemWithStringId(kShowWindowDecorationsCommand, 948 AddCheckItemWithStringId(kShowWindowDecorationsCommand,
948 IDS_SHOW_WINDOW_DECORATIONS_MENU); 949 IDS_SHOW_WINDOW_DECORATIONS_MENU);
949 } 950 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698