chrome/browser/chrome_content_browser_client.cc - Issue 2419723002: Move services/shell to services/service_manager

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/chrome_content_browser_client.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

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

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 9b2ca0d0d4f32b231024ea9e99af548a24f248f5..7da8c56d67da221654e695c2d5e44920ece202b3 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -183,8 +183,8 @@

#include "net/cookies/cookie_options.h"

#include "net/ssl/ssl_cert_request_info.h"

#include "ppapi/host/ppapi_host.h"

-#include "services/shell/public/cpp/interface_provider.h"

-#include "services/shell/public/cpp/service.h"

+#include "services/service_manager/public/cpp/interface_provider.h"

+#include "services/service_manager/public/cpp/service.h"

#include "storage/browser/fileapi/external_mount_points.h"

#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"

#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"

@@ -262,7 +262,7 @@

#endif

#if defined(USE_AURA)

-#include "services/shell/runner/common/client_util.h"

+#include "services/service_manager/runner/common/client_util.h"

#include "services/ui/public/cpp/gpu_service.h"

#include "ui/views/mus/window_manager_connection.h"

#endif

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »