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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

Patch Set: Sync up to r236620 Created 7 years, 1 month 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

« no previous file with comments | « chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | components/wifi.gypi » ('J')
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 5976de3ac3dcdf9e082366e108cefe2d5c0ff825..027b77465aa99e002974d213867dc61b676e8305 100644

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

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

@@ -78,6 +78,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"

@@ -141,7 +142,6 @@

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

#include "chrome/browser/chromeos/extensions/screenlock_private_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

@@ -211,9 +211,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

@@ -280,6 +277,9 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

extensions::MediaPlayerAPI::GetFactoryInstance();

#endif

extensions::MenuManagerFactory::GetInstance();

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

+ extensions::NetworkingPrivateEventRouterFactory::GetInstance();

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

extensions::OmniboxAPI::GetFactoryInstance();

#if defined(ENABLE_PLUGINS)

extensions::PluginManager::GetFactoryInstance();