| 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/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 8 #include "app/resource_bundle.h" | |
| 9 #include "base/stl_util-inl.h" | 8 #include "base/stl_util-inl.h" |
| 10 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 11 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 12 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
| 14 #include "chrome/browser/alternate_nav_url_fetcher.h" | 13 #include "chrome/browser/alternate_nav_url_fetcher.h" |
| 15 #import "chrome/browser/app_controller_mac.h" | 14 #import "chrome/browser/app_controller_mac.h" |
| 16 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" | 15 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" |
| 17 #import "chrome/browser/autocomplete/autocomplete_popup_model.h" | 16 #import "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 18 #include "chrome/browser/browser_list.h" | 17 #include "chrome/browser/browser_list.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 46 #include "chrome/browser/ui/omnibox/location_bar_util.h" | 45 #include "chrome/browser/ui/omnibox/location_bar_util.h" |
| 47 #include "chrome/common/extensions/extension.h" | 46 #include "chrome/common/extensions/extension.h" |
| 48 #include "chrome/common/extensions/extension_action.h" | 47 #include "chrome/common/extensions/extension_action.h" |
| 49 #include "chrome/common/extensions/extension_resource.h" | 48 #include "chrome/common/extensions/extension_resource.h" |
| 50 #include "chrome/common/notification_service.h" | 49 #include "chrome/common/notification_service.h" |
| 51 #include "net/base/net_util.h" | 50 #include "net/base/net_util.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" |
| 54 #include "skia/ext/skia_utils_mac.h" | 53 #include "skia/ext/skia_utils_mac.h" |
| 55 #include "third_party/skia/include/core/SkBitmap.h" | 54 #include "third_party/skia/include/core/SkBitmap.h" |
| 55 #include "ui/base/resource/resource_bundle.h" |
| 56 | 56 |
| 57 namespace { | 57 namespace { |
| 58 | 58 |
| 59 // Vertical space between the bottom edge of the location_bar and the first run | 59 // Vertical space between the bottom edge of the location_bar and the first run |
| 60 // bubble arrow point. | 60 // bubble arrow point. |
| 61 const static int kFirstRunBubbleYOffset = 1; | 61 const static int kFirstRunBubbleYOffset = 1; |
| 62 | 62 |
| 63 } | 63 } |
| 64 | 64 |
| 65 // TODO(shess): This code is mostly copied from the gtk | 65 // TODO(shess): This code is mostly copied from the gtk |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 | 683 |
| 684 // These need to change anytime the layout changes. | 684 // These need to change anytime the layout changes. |
| 685 // TODO(shess): Anytime the field editor might have changed, the | 685 // TODO(shess): Anytime the field editor might have changed, the |
| 686 // cursor rects almost certainly should have changed. The tooltips | 686 // cursor rects almost certainly should have changed. The tooltips |
| 687 // might change even when the rects don't change. | 687 // might change even when the rects don't change. |
| 688 [field_ resetFieldEditorFrameIfNeeded]; | 688 [field_ resetFieldEditorFrameIfNeeded]; |
| 689 [field_ updateCursorAndToolTipRects]; | 689 [field_ updateCursorAndToolTipRects]; |
| 690 | 690 |
| 691 [field_ setNeedsDisplay:YES]; | 691 [field_ setNeedsDisplay:YES]; |
| 692 } | 692 } |
| OLD | NEW |