chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 22295002: Base infrastructure for Networking Private API on Windows and Mac.

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 22295002: Base infrastructure for Networking Private API on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix NetworkingPrivateProcessClient lifetime tracking. Created 7 years, 2 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/networking_private/networking_private_process_client.cc ('K') | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index 4d3f8cac469d83ba64c547c6ee98e08dfbecd57b..052884578742a5a48001aa4d0d16422aa20e2d99 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -77,6 +77,7 @@

#include "chrome/browser/extensions/api/management/management_api.h"

#include "chrome/browser/extensions/api/mdns/mdns_api.h"

#include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"

+#include "chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h"

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

#include "chrome/browser/extensions/api/preference/chrome_direct_setting_api.h"

#include "chrome/browser/extensions/api/preference/preference_api.h"

@@ -129,7 +130,6 @@

#include "chrome/browser/chromeos/extensions/input_method_api.h"

#include "chrome/browser/chromeos/extensions/media_player_api.h"

#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

-#include "chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h"

#if defined(FILE_MANAGER_EXTENSION)

#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"

#endif

@@ -199,9 +199,6 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

#if defined(OS_ANDROID)

ProtectedMediaIdentifierPermissionContextFactory::GetInstance();

#endif

-#if defined(OS_CHROMEOS)

- chromeos::NetworkingPrivateEventRouterFactory::GetInstance();

-#endif

#if defined(ENABLE_FULL_PRINTING)

CloudPrintProxyServiceFactory::GetInstance();

#endif

@@ -262,6 +259,9 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

#if defined(OS_CHROMEOS)

extensions::MediaPlayerAPI::GetFactoryInstance();

#endif

+#if defined(ENABLE_EXTENSIONS) && defined(OS_CHROMEOS) || defined(OS_WIN)

tbarzic 2013/10/17 19:30:21 you don't need ENABLE_EXTENSIONS here (the block a

mef 2013/10/17 22:03:35 Done.

+ extensions::NetworkingPrivateEventRouterFactory::GetInstance();

+#endif // defined(ENABLE_EXTENSIONS) && defined(OS_CHROMEOS) || defined(OS_WIN)

extensions::OmniboxAPI::GetFactoryInstance();

#if defined(ENABLE_PLUGINS)

extensions::PluginManager::GetFactoryInstance();