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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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" 8 #include "app/resource_bundle.h"
9 #include "base/nsimage_cache_mac.h" 9 #include "base/nsimage_cache_mac.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/alternate_nav_url_fetcher.h" 15 #include "chrome/browser/alternate_nav_url_fetcher.h"
16 #import "chrome/browser/app_controller_mac.h" 16 #import "chrome/browser/app_controller_mac.h"
17 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" 17 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
18 #import "chrome/browser/autocomplete/autocomplete_popup_model.h" 18 #import "chrome/browser/autocomplete/autocomplete_popup_model.h"
19 #include "chrome/browser/browser_list.h" 19 #include "chrome/browser/browser_list.h"
20 #include "chrome/browser/command_updater.h" 20 #include "chrome/browser/command_updater.h"
21 #include "chrome/browser/content_setting_image_model.h" 21 #include "chrome/browser/content_setting_image_model.h"
22 #include "chrome/browser/content_setting_bubble_model.h" 22 #include "chrome/browser/content_setting_bubble_model.h"
23 #include "chrome/browser/defaults.h" 23 #include "chrome/browser/defaults.h"
24 #include "chrome/browser/extensions/extension_browser_event_router.h" 24 #include "chrome/browser/extensions/extension_browser_event_router.h"
25 #include "chrome/browser/extensions/extensions_service.h" 25 #include "chrome/browser/extensions/extensions_service.h"
26 #include "chrome/browser/extensions/extension_tabs_module.h" 26 #include "chrome/browser/extensions/extension_tabs_module.h"
27 #include "chrome/browser/instant/instant_controller.h" 27 #include "chrome/browser/instant/instant_controller.h"
28 #include "chrome/browser/location_bar_util.h"
29 #include "chrome/browser/profile.h" 28 #include "chrome/browser/profile.h"
30 #include "chrome/browser/search_engines/template_url.h" 29 #include "chrome/browser/search_engines/template_url.h"
31 #include "chrome/browser/search_engines/template_url_model.h" 30 #include "chrome/browser/search_engines/template_url_model.h"
32 #include "chrome/browser/tab_contents/navigation_entry.h" 31 #include "chrome/browser/tab_contents/navigation_entry.h"
33 #include "chrome/browser/tab_contents/tab_contents.h" 32 #include "chrome/browser/tab_contents/tab_contents.h"
34 #import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h" 33 #import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
35 #include "chrome/browser/ui/cocoa/event_utils.h" 34 #include "chrome/browser/ui/cocoa/event_utils.h"
36 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" 35 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
37 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 36 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
38 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" 37 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
39 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" 38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
40 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" 39 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
41 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h" 40 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
42 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h" 41 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
43 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" 42 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
44 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" 43 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
45 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" 44 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
46 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" 45 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
47 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 46 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
47 #include "chrome/browser/ui/omnibox/location_bar_util.h"
48 #include "chrome/common/extensions/extension.h" 48 #include "chrome/common/extensions/extension.h"
49 #include "chrome/common/extensions/extension_action.h" 49 #include "chrome/common/extensions/extension_action.h"
50 #include "chrome/common/extensions/extension_resource.h" 50 #include "chrome/common/extensions/extension_resource.h"
51 #include "chrome/common/notification_service.h" 51 #include "chrome/common/notification_service.h"
52 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
53 #include "net/base/net_util.h" 53 #include "net/base/net_util.h"
54 #include "grit/generated_resources.h" 54 #include "grit/generated_resources.h"
55 #include "grit/theme_resources.h" 55 #include "grit/theme_resources.h"
56 #include "skia/ext/skia_utils_mac.h" 56 #include "skia/ext/skia_utils_mac.h"
57 #include "third_party/skia/include/core/SkBitmap.h" 57 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 681
682 // These need to change anytime the layout changes. 682 // These need to change anytime the layout changes.
683 // TODO(shess): Anytime the field editor might have changed, the 683 // TODO(shess): Anytime the field editor might have changed, the
684 // cursor rects almost certainly should have changed. The tooltips 684 // cursor rects almost certainly should have changed. The tooltips
685 // might change even when the rects don't change. 685 // might change even when the rects don't change.
686 [field_ resetFieldEditorFrameIfNeeded]; 686 [field_ resetFieldEditorFrameIfNeeded];
687 [field_ updateCursorAndToolTipRects]; 687 [field_ updateCursorAndToolTipRects];
688 688
689 [field_ setNeedsDisplay:YES]; 689 [field_ setNeedsDisplay:YES];
690 } 690 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698