chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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

« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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 "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

	10 #include "base/prefs/pref_service.h"

10 #include "base/stl_util.h"	11 #include "base/stl_util.h"

11 #include "base/string_util.h"	12 #include "base/string_util.h"

12 #include "base/sys_string_conversions.h"	13 #include "base/sys_string_conversions.h"

13 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

14 #include "chrome/app/chrome_command_ids.h"	15 #include "chrome/app/chrome_command_ids.h"

15 #import "chrome/browser/app_controller_mac.h"	16 #import "chrome/browser/app_controller_mac.h"

16 #include "chrome/browser/command_updater.h"	17 #include "chrome/browser/command_updater.h"

17 #include "chrome/browser/defaults.h"	18 #include "chrome/browser/defaults.h"

18 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"	19 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"

19 #include "chrome/browser/extensions/api/tabs/tabs_api.h"	20 #include "chrome/browser/extensions/api/tabs/tabs_api.h"

20 #include "chrome/browser/extensions/extension_action.h"	21 #include "chrome/browser/extensions/extension_action.h"

21 #include "chrome/browser/extensions/location_bar_controller.h"	22 #include "chrome/browser/extensions/location_bar_controller.h"

22 #include "chrome/browser/extensions/tab_helper.h"	23 #include "chrome/browser/extensions/tab_helper.h"

23 #include "chrome/browser/prefs/pref_service.h"

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

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

26 #include "chrome/browser/search_engines/template_url_service.h"	26 #include "chrome/browser/search_engines/template_url_service.h"

27 #include "chrome/browser/search_engines/template_url_service_factory.h"	27 #include "chrome/browser/search_engines/template_url_service_factory.h"

28 #include "chrome/browser/ui/browser_instant_controller.h"	28 #include "chrome/browser/ui/browser_instant_controller.h"

29 #include "chrome/browser/ui/browser_list.h"	29 #include "chrome/browser/ui/browser_list.h"

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

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

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

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

(...skipping 786 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
820 if (!toolbar_model_->GetInputInProgress() &&	820 if (!toolbar_model_->GetInputInProgress() &&

821 toolbar_model_->WouldReplaceSearchURLWithSearchTerms()) {	821 toolbar_model_->WouldReplaceSearchURLWithSearchTerms()) {

822 const TemplateURL* template_url =	822 const TemplateURL* template_url =

823 TemplateURLServiceFactory::GetForProfile(profile_)->	823 TemplateURLServiceFactory::GetForProfile(profile_)->

824 GetDefaultSearchProvider();	824 GetDefaultSearchProvider();

825 if (template_url)	825 if (template_url)

826 return template_url->short_name();	826 return template_url->short_name();

827 }	827 }

828 return string16();	828 return string16();

829 }	829 }

OLD	NEW