chrome/browser/profile.cc - Issue 18263: Move search engines files into subdir

Side by Side Diff: chrome/browser/profile.cc

Issue 18263: Move search engines files into subdir (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

« no previous file with comments | « chrome/browser/metrics_service.cc ('k') | chrome/browser/render_view_context_menu.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 #include "chrome/browser/profile.h"	5 #include "chrome/browser/profile.h"

6	6

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

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

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

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

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/scoped_ptr.h"	12 #include "base/scoped_ptr.h"

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

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "chrome/app/locales/locale_settings.h"	15 #include "chrome/app/locales/locale_settings.h"

16 #include "chrome/browser/bookmarks/bookmark_model.h"	16 #include "chrome/browser/bookmarks/bookmark_model.h"

17 #include "chrome/browser/browser_list.h"	17 #include "chrome/browser/browser_list.h"

18 #include "chrome/browser/browser_process.h"	18 #include "chrome/browser/browser_process.h"

19 #include "chrome/browser/download/download_manager.h"	19 #include "chrome/browser/download/download_manager.h"

20 #include "chrome/browser/extensions/extensions_service.h"	20 #include "chrome/browser/extensions/extensions_service.h"

21 #include "chrome/browser/extensions/user_script_master.h"	21 #include "chrome/browser/extensions/user_script_master.h"

22 #include "chrome/browser/history/history.h"	22 #include "chrome/browser/history/history.h"

23 #include "chrome/browser/net/chrome_url_request_context.h"	23 #include "chrome/browser/net/chrome_url_request_context.h"

24 #include "chrome/browser/profile_manager.h"	24 #include "chrome/browser/profile_manager.h"

25 #include "chrome/browser/render_process_host.h"	25 #include "chrome/browser/render_process_host.h"

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

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

26 #include "chrome/browser/sessions/session_service.h"	28 #include "chrome/browser/sessions/session_service.h"

27 #include "chrome/browser/sessions/tab_restore_service.h"	29 #include "chrome/browser/sessions/tab_restore_service.h"

28 #include "chrome/browser/spellchecker.h"	30 #include "chrome/browser/spellchecker.h"

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

30 #include "chrome/browser/template_url_fetcher.h"

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

32 #include "chrome/browser/visitedlink_master.h"	32 #include "chrome/browser/visitedlink_master.h"

33 #include "chrome/browser/webdata/web_data_service.h"	33 #include "chrome/browser/webdata/web_data_service.h"

34 #include "chrome/common/chrome_constants.h"	34 #include "chrome/common/chrome_constants.h"

35 #include "chrome/common/chrome_paths.h"	35 #include "chrome/common/chrome_paths.h"

36 #include "chrome/common/chrome_switches.h"	36 #include "chrome/common/chrome_switches.h"

37 #include "chrome/common/net/cookie_monster_sqlite.h"	37 #include "chrome/common/net/cookie_monster_sqlite.h"

38 #include "chrome/common/notification_service.h"	38 #include "chrome/common/notification_service.h"

39 #include "chrome/common/pref_names.h"	39 #include "chrome/common/pref_names.h"

40 #include "chrome/common/pref_service.h"	40 #include "chrome/common/pref_service.h"

41 #include "chrome/common/resource_bundle.h"	41 #include "chrome/common/resource_bundle.h"

(...skipping 716 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
758 }	758 }

759	759

760 #ifdef CHROME_PERSONALIZATION	760 #ifdef CHROME_PERSONALIZATION

761 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {	761 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {

762 if (!personalization_.get())	762 if (!personalization_.get())

763 personalization_.reset(	763 personalization_.reset(

764 Personalization::CreateProfilePersonalization(this));	764 Personalization::CreateProfilePersonalization(this));

765 return personalization_.get();	765 return personalization_.get();

766 }	766 }

767 #endif	767 #endif

OLD	NEW