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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (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
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/view_id_util.h » ('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" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "app/mac/nsimage_cache.h" 10 #include "app/mac/nsimage_cache.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
43 #import "chrome/browser/ui/cocoa/view_id_util.h" 43 #import "chrome/browser/ui/cocoa/view_id_util.h"
44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
45 #include "chrome/browser/ui/toolbar/toolbar_model.h" 45 #include "chrome/browser/ui/toolbar/toolbar_model.h"
46 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 46 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
47 #include "chrome/common/notification_details.h" 47 #include "chrome/common/notification_details.h"
48 #include "chrome/common/notification_observer.h" 48 #include "chrome/common/notification_observer.h"
49 #include "chrome/common/notification_service.h" 49 #include "chrome/common/notification_service.h"
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 "gfx/rect.h"
53 #include "grit/chromium_strings.h" 52 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 53 #include "grit/generated_resources.h"
55 #include "grit/theme_resources.h" 54 #include "grit/theme_resources.h"
56 #include "ui/base/l10n/l10n_util_mac.h" 55 #include "ui/base/l10n/l10n_util_mac.h"
57 #include "ui/base/models/accelerator_cocoa.h" 56 #include "ui/base/models/accelerator_cocoa.h"
58 #include "ui/base/models/menu_model.h" 57 #include "ui/base/models/menu_model.h"
59 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/gfx/rect.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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { 798 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
799 // Do nothing. 799 // Do nothing.
800 } 800 }
801 801
802 // (URLDropTargetController protocol) 802 // (URLDropTargetController protocol)
803 - (void)hideDropURLsIndicatorInView:(NSView*)view { 803 - (void)hideDropURLsIndicatorInView:(NSView*)view {
804 // Do nothing. 804 // Do nothing.
805 } 805 }
806 806
807 @end 807 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/view_id_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698