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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "app/mac/nsimage_cache.h" 10 #include "app/mac/nsimage_cache.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/common/notification_type.h" 50 #include "chrome/common/notification_type.h"
51 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
52 #include "grit/chromium_strings.h" 52 #include "grit/chromium_strings.h"
53 #include "grit/generated_resources.h" 53 #include "grit/generated_resources.h"
54 #include "grit/theme_resources.h" 54 #include "grit/theme_resources.h"
55 #include "ui/base/l10n/l10n_util_mac.h" 55 #include "ui/base/l10n/l10n_util_mac.h"
56 #include "ui/base/models/accelerator_cocoa.h" 56 #include "ui/base/models/accelerator_cocoa.h"
57 #include "ui/base/models/menu_model.h" 57 #include "ui/base/models/menu_model.h"
58 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/gfx/rect.h" 59 #include "ui/gfx/rect.h"
60 #include "ui/gfx/image.h"
60 61
61 namespace { 62 namespace {
62 63
63 // Names of images in the bundle for buttons. 64 // Names of images in the bundle for buttons.
64 NSString* const kBackButtonImageName = @"back_Template.pdf"; 65 NSString* const kBackButtonImageName = @"back_Template.pdf";
65 NSString* const kForwardButtonImageName = @"forward_Template.pdf"; 66 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
66 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf"; 67 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf";
67 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf"; 68 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf";
68 NSString* const kHomeButtonImageName = @"home_Template.pdf"; 69 NSString* const kHomeButtonImageName = @"home_Template.pdf";
69 NSString* const kWrenchButtonImageName = @"tools_Template.pdf"; 70 NSString* const kWrenchButtonImageName = @"tools_Template.pdf";
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { 799 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
799 // Do nothing. 800 // Do nothing.
800 } 801 }
801 802
802 // (URLDropTargetController protocol) 803 // (URLDropTargetController protocol)
803 - (void)hideDropURLsIndicatorInView:(NSView*)view { 804 - (void)hideDropURLsIndicatorInView:(NSView*)view {
804 // Do nothing. 805 // Do nothing.
805 } 806 }
806 807
807 @end 808 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698