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

Side by Side 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 unified diff | Download patch
OLDNEW
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 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
14 #include "base/memory/linked_ptr.h" 14 #include "base/memory/linked_ptr.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "content/public/browser/certificate_request_result_type.h" 18 #include "content/public/browser/certificate_request_result_type.h"
19 #include "content/public/browser/desktop_notification_delegate.h" 19 #include "content/public/browser/desktop_notification_delegate.h"
20 #include "content/public/browser/permission_type.h" 20 #include "content/public/browser/permission_type.h"
21 #include "content/public/common/content_client.h" 21 #include "content/public/common/content_client.h"
22 #include "content/public/common/media_stream_request.h" 22 #include "content/public/common/media_stream_request.h"
23 #include "content/public/common/resource_type.h" 23 #include "content/public/common/resource_type.h"
24 #include "content/public/common/service_registry.h"
24 #include "content/public/common/socket_permission_request.h" 25 #include "content/public/common/socket_permission_request.h"
25 #include "content/public/common/window_container_type.h" 26 #include "content/public/common/window_container_type.h"
26 #include "net/base/mime_util.h" 27 #include "net/base/mime_util.h"
27 #include "net/cookies/canonical_cookie.h" 28 #include "net/cookies/canonical_cookie.h"
28 #include "net/url_request/url_request_interceptor.h" 29 #include "net/url_request/url_request_interceptor.h"
29 #include "net/url_request/url_request_job_factory.h" 30 #include "net/url_request/url_request_job_factory.h"
30 #include "storage/browser/fileapi/file_system_context.h" 31 #include "storage/browser/fileapi/file_system_context.h"
31 #include "third_party/WebKit/public/platform/WebNotificationPermission.h" 32 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"
32 #include "ui/base/window_open_disposition.h" 33 #include "ui/base/window_open_disposition.h"
33 34
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 virtual ExternalVideoSurfaceContainer* 619 virtual ExternalVideoSurfaceContainer*
619 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 620 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
620 #endif 621 #endif
621 622
622 // Checks if |security_origin| has permission to access the microphone or 623 // Checks if |security_origin| has permission to access the microphone or
623 // camera. Note that this does not query the user. |type| must be 624 // camera. Note that this does not query the user. |type| must be
624 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. 625 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
625 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, 626 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context,
626 const GURL& security_origin, 627 const GURL& security_origin,
627 MediaStreamType type); 628 MediaStreamType type);
629
630 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.
628 }; 631 };
629 632
630 } // namespace content 633 } // namespace content
631 634
632 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 635 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698