OLD | NEW |
---|---|
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/mac/nsimage_cache.h" | |
10 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
11 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
12 #include "base/string_util.h" | 11 #include "base/string_util.h" |
13 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
14 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
15 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/autocomplete/autocomplete.h" | 15 #include "chrome/browser/autocomplete/autocomplete.h" |
17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 16 #include "chrome/browser/autocomplete/autocomplete_classifier.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" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 #include "grit/chromium_strings.h" | 53 #include "grit/chromium_strings.h" |
55 #include "grit/generated_resources.h" | 54 #include "grit/generated_resources.h" |
56 #include "grit/theme_resources.h" | 55 #include "grit/theme_resources.h" |
57 #include "grit/theme_resources_standard.h" | 56 #include "grit/theme_resources_standard.h" |
58 #include "ui/base/l10n/l10n_util.h" | 57 #include "ui/base/l10n/l10n_util.h" |
59 #include "ui/base/l10n/l10n_util_mac.h" | 58 #include "ui/base/l10n/l10n_util_mac.h" |
60 #include "ui/base/models/accelerator_cocoa.h" | 59 #include "ui/base/models/accelerator_cocoa.h" |
61 #include "ui/base/models/menu_model.h" | 60 #include "ui/base/models/menu_model.h" |
62 #include "ui/base/resource/resource_bundle.h" | 61 #include "ui/base/resource/resource_bundle.h" |
63 #include "ui/gfx/image/image.h" | 62 #include "ui/gfx/image/image.h" |
63 #include "ui/gfx/mac/nsimage_cache.h" | |
Robert Sesek
2011/06/21 20:13:28
Do we use this here?
tfarina
2011/06/21 20:23:36
Removed.
| |
64 #include "ui/gfx/rect.h" | 64 #include "ui/gfx/rect.h" |
65 | 65 |
66 namespace { | 66 namespace { |
67 | 67 |
68 // Height of the toolbar in pixels when the bookmark bar is closed. | 68 // Height of the toolbar in pixels when the bookmark bar is closed. |
69 const CGFloat kBaseToolbarHeight = 35.0; | 69 const CGFloat kBaseToolbarHeight = 35.0; |
70 | 70 |
71 // The minimum width of the location bar in pixels. | 71 // The minimum width of the location bar in pixels. |
72 const CGFloat kMinimumLocationBarWidth = 100.0; | 72 const CGFloat kMinimumLocationBarWidth = 100.0; |
73 | 73 |
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
788 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { | 788 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { |
789 // Do nothing. | 789 // Do nothing. |
790 } | 790 } |
791 | 791 |
792 // (URLDropTargetController protocol) | 792 // (URLDropTargetController protocol) |
793 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 793 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
794 // Do nothing. | 794 // Do nothing. |
795 } | 795 } |
796 | 796 |
797 @end | 797 @end |
OLD | NEW |