chrome/browser/background/background_contents_service.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/background/background_contents_service.cc

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/automation/testing_automation_provider_chromeos.cc ('k') | chrome/browser/background/background_contents_service_factory.cc » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #include "chrome/browser/background/background_contents_service.h"	5 #include "chrome/browser/background/background_contents_service.h"

6	6

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

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

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

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

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

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

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

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

14 #include "chrome/browser/background/background_contents_service_factory.h"	15 #include "chrome/browser/background/background_contents_service_factory.h"

15 #include "chrome/browser/browser_process.h"	16 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/extensions/extension_host.h"	17 #include "chrome/browser/extensions/extension_host.h"

17 #include "chrome/browser/extensions/extension_service.h"	18 #include "chrome/browser/extensions/extension_service.h"

18 #include "chrome/browser/extensions/extension_system.h"	19 #include "chrome/browser/extensions/extension_system.h"

19 #include "chrome/browser/notifications/desktop_notification_service.h"	20 #include "chrome/browser/notifications/desktop_notification_service.h"

20 #include "chrome/browser/notifications/notification.h"	21 #include "chrome/browser/notifications/notification.h"

21 #include "chrome/browser/notifications/notification_ui_manager.h"	22 #include "chrome/browser/notifications/notification_ui_manager.h"

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

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

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

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

26 #include "chrome/browser/ui/browser_finder.h"	26 #include "chrome/browser/ui/browser_finder.h"

27 #include "chrome/browser/ui/browser_tabstrip.h"	27 #include "chrome/browser/ui/browser_tabstrip.h"

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

29 #include "chrome/common/chrome_notification_types.h"	29 #include "chrome/common/chrome_notification_types.h"

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

31 #include "chrome/common/extensions/extension.h"	31 #include "chrome/common/extensions/extension.h"

	32 #include "chrome/common/extensions/extension_constants.h"

32 #include "chrome/common/extensions/extension_icon_set.h"	33 #include "chrome/common/extensions/extension_icon_set.h"

33 #include "chrome/common/extensions/extension_constants.h"

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

35 #include "content/public/browser/notification_service.h"	35 #include "content/public/browser/notification_service.h"

36 #include "content/public/browser/site_instance.h"	36 #include "content/public/browser/site_instance.h"

37 #include "content/public/browser/web_contents.h"	37 #include "content/public/browser/web_contents.h"

38 #include "grit/generated_resources.h"	38 #include "grit/generated_resources.h"

39 #include "ipc/ipc_message.h"	39 #include "ipc/ipc_message.h"

40 #include "ui/base/l10n/l10n_util.h"	40 #include "ui/base/l10n/l10n_util.h"

41	41

42 using content::SiteInstance;	42 using content::SiteInstance;

43 using content::WebContents;	43 using content::WebContents;

(...skipping 586 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
630 bool user_gesture,	630 bool user_gesture,

631 bool* was_blocked) {	631 bool* was_blocked) {

632 Browser* browser = chrome::FindLastActiveWithProfile(	632 Browser* browser = chrome::FindLastActiveWithProfile(

633 Profile::FromBrowserContext(new_contents->GetBrowserContext()),	633 Profile::FromBrowserContext(new_contents->GetBrowserContext()),

634 chrome::GetActiveDesktop());	634 chrome::GetActiveDesktop());

635 if (browser) {	635 if (browser) {

636 chrome::AddWebContents(browser, NULL, new_contents, disposition,	636 chrome::AddWebContents(browser, NULL, new_contents, disposition,

637 initial_pos, user_gesture, was_blocked);	637 initial_pos, user_gesture, was_blocked);

638 }	638 }

639 }	639 }

OLD	NEW