Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2051)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/browser/content_browser_client.h

Issue 734123002: Mojify the battery status browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clang-format. Created 6 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
« content/browser/battery_status/battery_status_browsertest.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index c44788bdeab2db9697116dce9e805bb2e4a22994..3bb9e58d54c16b644068adf81195b830fc11f5d1 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -21,6 +21,7 @@
#include "content/public/common/content_client.h"
#include "content/public/common/media_stream_request.h"
#include "content/public/common/resource_type.h"
+#include "content/public/common/service_registry.h"
#include "content/public/common/socket_permission_request.h"
#include "content/public/common/window_container_type.h"
#include "net/base/mime_util.h"
@@ -625,6 +626,8 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual bool CheckMediaAccessPermission(BrowserContext* browser_context,
const GURL& security_origin,
MediaStreamType type);
+
+virtual void OverridePerProcessMojoServices(ServiceRegistry* registry);
qsr 2014/11/18 11:11:50 Maybe forward declare ServiceRegistry instead of i
ppi 2014/11/18 12:39:31 Done.
};
} // namespace content
« content/browser/battery_status/battery_status_browsertest.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698