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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/l10n_util_mac.h" 10 #include "app/l10n_util_mac.h"
11 #include "app/mac/nsimage_cache.h" 11 #include "app/mac/nsimage_cache.h"
12 #include "app/resource_bundle.h"
13 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
14 #include "base/singleton.h" 13 #include "base/singleton.h"
15 #include "base/sys_string_conversions.h" 14 #include "base/sys_string_conversions.h"
16 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/browser/autocomplete/autocomplete.h" 16 #include "chrome/browser/autocomplete/autocomplete.h"
18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
19 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 18 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
20 #include "chrome/browser/autocomplete/autocomplete_match.h" 19 #include "chrome/browser/autocomplete/autocomplete_match.h"
21 #include "chrome/browser/background_page_tracker.h" 20 #include "chrome/browser/background_page_tracker.h"
22 #include "chrome/browser/net/url_fixer_upper.h" 21 #include "chrome/browser/net/url_fixer_upper.h"
(...skipping 27 matching lines...) Expand all
50 #include "chrome/common/notification_observer.h" 49 #include "chrome/common/notification_observer.h"
51 #include "chrome/common/notification_service.h" 50 #include "chrome/common/notification_service.h"
52 #include "chrome/common/notification_type.h" 51 #include "chrome/common/notification_type.h"
53 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
54 #include "gfx/rect.h" 53 #include "gfx/rect.h"
55 #include "grit/chromium_strings.h" 54 #include "grit/chromium_strings.h"
56 #include "grit/generated_resources.h" 55 #include "grit/generated_resources.h"
57 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
58 #include "ui/base/models/accelerator_cocoa.h" 57 #include "ui/base/models/accelerator_cocoa.h"
59 #include "ui/base/models/menu_model.h" 58 #include "ui/base/models/menu_model.h"
59 #include "ui/base/resource/resource_bundle.h"
60 60
61 namespace { 61 namespace {
62 62
63 // Names of images in the bundle for buttons. 63 // Names of images in the bundle for buttons.
64 NSString* const kBackButtonImageName = @"back_Template.pdf"; 64 NSString* const kBackButtonImageName = @"back_Template.pdf";
65 NSString* const kForwardButtonImageName = @"forward_Template.pdf"; 65 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
66 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf"; 66 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf";
67 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf"; 67 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf";
68 NSString* const kHomeButtonImageName = @"home_Template.pdf"; 68 NSString* const kHomeButtonImageName = @"home_Template.pdf";
69 NSString* const kWrenchButtonImageName = @"tools_Template.pdf"; 69 NSString* const kWrenchButtonImageName = @"tools_Template.pdf";
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { 799 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
800 // Do nothing. 800 // Do nothing.
801 } 801 }
802 802
803 // (URLDropTargetController protocol) 803 // (URLDropTargetController protocol)
804 - (void)hideDropURLsIndicatorInView:(NSView*)view { 804 - (void)hideDropURLsIndicatorInView:(NSView*)view {
805 // Do nothing. 805 // Do nothing.
806 } 806 }
807 807
808 @end 808 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm ('k') | chrome/browser/ui/gtk/about_chrome_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698