OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/cocoa/toolbar_controller.h" | 5 #import "chrome/browser/cocoa/toolbar_controller.h" |
6 | 6 |
7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
8 #include "base/mac_util.h" | 8 #include "base/mac_util.h" |
| 9 #include "base/nsimage_cache_mac.h" |
9 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
10 #include "base/gfx/rect.h" | 11 #include "base/gfx/rect.h" |
11 #include "chrome/app/chrome_dll_resource.h" | 12 #include "chrome/app/chrome_dll_resource.h" |
12 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 13 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
13 #include "chrome/browser/bubble_positioner.h" | 14 #include "chrome/browser/bubble_positioner.h" |
14 #import "chrome/browser/cocoa/autocomplete_text_field.h" | 15 #import "chrome/browser/cocoa/autocomplete_text_field.h" |
15 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h" | 16 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h" |
16 #import "chrome/browser/cocoa/back_forward_menu_controller.h" | 17 #import "chrome/browser/cocoa/back_forward_menu_controller.h" |
17 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" | 18 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" |
18 #import "chrome/browser/cocoa/gradient_button_cell.h" | 19 #import "chrome/browser/cocoa/gradient_button_cell.h" |
19 #import "chrome/browser/cocoa/location_bar_view_mac.h" | 20 #import "chrome/browser/cocoa/location_bar_view_mac.h" |
20 #import "chrome/browser/cocoa/menu_button.h" | 21 #import "chrome/browser/cocoa/menu_button.h" |
21 #include "chrome/browser/cocoa/nsimage_cache.h" | |
22 #include "chrome/browser/profile.h" | 22 #include "chrome/browser/profile.h" |
23 #include "chrome/browser/search_engines/template_url_model.h" | 23 #include "chrome/browser/search_engines/template_url_model.h" |
24 #include "chrome/browser/toolbar_model.h" | 24 #include "chrome/browser/toolbar_model.h" |
25 #include "chrome/common/notification_details.h" | 25 #include "chrome/common/notification_details.h" |
26 #include "chrome/common/notification_observer.h" | 26 #include "chrome/common/notification_observer.h" |
27 #include "chrome/common/notification_type.h" | 27 #include "chrome/common/notification_type.h" |
28 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
29 #include "chrome/common/pref_service.h" | 29 #include "chrome/common/pref_service.h" |
30 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
31 | 31 |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 | 532 |
533 NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX, | 533 NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX, |
534 NSHeight(locationFrame)); | 534 NSHeight(locationFrame)); |
535 gfx::Rect stack_bounds( | 535 gfx::Rect stack_bounds( |
536 NSRectToCGRect([[self view] convertRect:r toView:nil])); | 536 NSRectToCGRect([[self view] convertRect:r toView:nil])); |
537 // Inset the bounds to just inside the visible edges (see comment above). | 537 // Inset the bounds to just inside the visible edges (see comment above). |
538 stack_bounds.Inset(kLocationStackEdgeWidth, 0); | 538 stack_bounds.Inset(kLocationStackEdgeWidth, 0); |
539 return stack_bounds; | 539 return stack_bounds; |
540 } | 540 } |
541 @end | 541 @end |
OLD | NEW |