chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 6294008: [Mac] Organize some files into chrome/browser/ui/cocoa/content_settings/....

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

Issue 6294008: [Mac] Organize some files into chrome/browser/ui/cocoa/content_settings/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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

« chrome/browser/ui/cocoa/content_settings/OWNERS ('K') | « chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm ('k') | chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"	8 #include "app/resource_bundle.h"

9 #include "base/stl_util-inl.h"	9 #include "base/stl_util-inl.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "chrome/browser/defaults.h"	22 #include "chrome/browser/defaults.h"

23 #include "chrome/browser/extensions/extension_browser_event_router.h"	23 #include "chrome/browser/extensions/extension_browser_event_router.h"

24 #include "chrome/browser/extensions/extension_service.h"	24 #include "chrome/browser/extensions/extension_service.h"

25 #include "chrome/browser/extensions/extension_tabs_module.h"	25 #include "chrome/browser/extensions/extension_tabs_module.h"

26 #include "chrome/browser/instant/instant_controller.h"	26 #include "chrome/browser/instant/instant_controller.h"

27 #include "chrome/browser/profiles/profile.h"	27 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/search_engines/template_url.h"	28 #include "chrome/browser/search_engines/template_url.h"

29 #include "chrome/browser/search_engines/template_url_model.h"	29 #include "chrome/browser/search_engines/template_url_model.h"

30 #include "chrome/browser/tab_contents/navigation_entry.h"	30 #include "chrome/browser/tab_contents/navigation_entry.h"

31 #include "chrome/browser/tab_contents/tab_contents.h"	31 #include "chrome/browser/tab_contents/tab_contents.h"

32 #import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"	32 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "

33 #include "chrome/browser/ui/cocoa/event_utils.h"	33 #include "chrome/browser/ui/cocoa/event_utils.h"

34 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"	34 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

35 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"	35 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

36 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"	36 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"

37 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"	37 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"

38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"	38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"

39 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"	39 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"

40 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"	40 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"

41 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"	41 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"

42 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"	42 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"

(...skipping 645 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
688	688

689 // These need to change anytime the layout changes.	689 // These need to change anytime the layout changes.

690 // TODO(shess): Anytime the field editor might have changed, the	690 // TODO(shess): Anytime the field editor might have changed, the

691 // cursor rects almost certainly should have changed. The tooltips	691 // cursor rects almost certainly should have changed. The tooltips

692 // might change even when the rects don't change.	692 // might change even when the rects don't change.

693 [field_ resetFieldEditorFrameIfNeeded];	693 [field_ resetFieldEditorFrameIfNeeded];

694 [field_ updateCursorAndToolTipRects];	694 [field_ updateCursorAndToolTipRects];

695	695

696 [field_ setNeedsDisplay:YES];	696 [field_ setNeedsDisplay:YES];

697 }	697 }

OLD	NEW