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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 9 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
« no previous file with comments | « chrome/browser/ui/cocoa/theme_install_bubble_view.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('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) 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"
10 #include "app/mac/nsimage_cache.h" 9 #include "app/mac/nsimage_cache.h"
11 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
12 #include "base/singleton.h" 11 #include "base/singleton.h"
13 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
14 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/autocomplete/autocomplete.h" 14 #include "chrome/browser/autocomplete/autocomplete.h"
16 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 15 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
17 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 16 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
18 #include "chrome/browser/autocomplete/autocomplete_match.h" 17 #include "chrome/browser/autocomplete/autocomplete_match.h"
19 #include "chrome/browser/net/url_fixer_upper.h" 18 #include "chrome/browser/net/url_fixer_upper.h"
20 #include "chrome/browser/prefs/pref_service.h" 19 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/search_engines/template_url_model.h" 21 #include "chrome/browser/search_engines/template_url_model.h"
23 #include "chrome/browser/themes/browser_theme_provider.h" 22 #include "chrome/browser/themes/browser_theme_provider.h"
24 #include "chrome/browser/upgrade_detector.h"
25 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_window.h" 24 #include "chrome/browser/ui/browser_window.h"
27 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" 25 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
28 #import "chrome/browser/ui/cocoa/background_gradient_view.h" 26 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
29 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" 27 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
30 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 28 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 29 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
32 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
33 #import "chrome/browser/ui/cocoa/gradient_button_cell.h" 31 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 32 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
35 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
36 #import "chrome/browser/ui/cocoa/menu_button.h" 34 #import "chrome/browser/ui/cocoa/menu_button.h"
37 #import "chrome/browser/ui/cocoa/menu_controller.h" 35 #import "chrome/browser/ui/cocoa/menu_controller.h"
38 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h" 36 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
39 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" 37 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"
40 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
41 #import "chrome/browser/ui/cocoa/view_id_util.h" 39 #import "chrome/browser/ui/cocoa/view_id_util.h"
42 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 40 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
43 #include "chrome/browser/ui/toolbar/toolbar_model.h" 41 #include "chrome/browser/ui/toolbar/toolbar_model.h"
44 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 42 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
45 #include "chrome/common/notification_details.h" 43 #include "chrome/browser/upgrade_detector.h"
46 #include "chrome/common/notification_observer.h"
47 #include "chrome/common/notification_service.h"
48 #include "chrome/common/notification_type.h"
49 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
50 #include "content/browser/tab_contents/tab_contents.h" 45 #include "content/browser/tab_contents/tab_contents.h"
46 #include "content/common/notification_details.h"
47 #include "content/common/notification_observer.h"
48 #include "content/common/notification_service.h"
49 #include "content/common/notification_type.h"
51 #include "grit/chromium_strings.h" 50 #include "grit/chromium_strings.h"
52 #include "grit/generated_resources.h" 51 #include "grit/generated_resources.h"
53 #include "grit/theme_resources.h" 52 #include "grit/theme_resources.h"
53 #include "ui/base/l10n/l10n_util.h"
54 #include "ui/base/l10n/l10n_util_mac.h" 54 #include "ui/base/l10n/l10n_util_mac.h"
55 #include "ui/base/models/accelerator_cocoa.h" 55 #include "ui/base/models/accelerator_cocoa.h"
56 #include "ui/base/models/menu_model.h" 56 #include "ui/base/models/menu_model.h"
57 #include "ui/base/resource/resource_bundle.h" 57 #include "ui/base/resource/resource_bundle.h"
58 #include "ui/gfx/image.h"
58 #include "ui/gfx/rect.h" 59 #include "ui/gfx/rect.h"
59 #include "ui/gfx/image.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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { 790 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
791 // Do nothing. 791 // Do nothing.
792 } 792 }
793 793
794 // (URLDropTargetController protocol) 794 // (URLDropTargetController protocol)
795 - (void)hideDropURLsIndicatorInView:(NSView*)view { 795 - (void)hideDropURLsIndicatorInView:(NSView*)view {
796 // Do nothing. 796 // Do nothing.
797 } 797 }
798 798
799 @end 799 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/theme_install_bubble_view.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698