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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/common/DEPS ('k') | content/public/test/async_file_test_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/content_client.h" 20 #include "content/public/common/content_client.h"
21 #include "content/public/common/media_stream_request.h" 21 #include "content/public/common/media_stream_request.h"
22 #include "content/public/common/resource_type.h" 22 #include "content/public/common/resource_type.h"
23 #include "content/public/common/socket_permission_request.h" 23 #include "content/public/common/socket_permission_request.h"
24 #include "content/public/common/window_container_type.h" 24 #include "content/public/common/window_container_type.h"
25 #include "net/base/mime_util.h" 25 #include "net/base/mime_util.h"
26 #include "net/cookies/canonical_cookie.h" 26 #include "net/cookies/canonical_cookie.h"
27 #include "net/url_request/url_request_interceptor.h" 27 #include "net/url_request/url_request_interceptor.h"
28 #include "net/url_request/url_request_job_factory.h" 28 #include "net/url_request/url_request_job_factory.h"
29 #include "storage/browser/fileapi/file_system_context.h"
29 #include "third_party/WebKit/public/platform/WebNotificationPermission.h" 30 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"
30 #include "ui/base/window_open_disposition.h" 31 #include "ui/base/window_open_disposition.h"
31 #include "webkit/browser/fileapi/file_system_context.h"
32 32
33 #if defined(OS_POSIX) && !defined(OS_MACOSX) 33 #if defined(OS_POSIX) && !defined(OS_MACOSX)
34 #include "base/posix/global_descriptors.h" 34 #include "base/posix/global_descriptors.h"
35 #endif 35 #endif
36 36
37 #if defined(OS_POSIX) 37 #if defined(OS_POSIX)
38 #include "content/public/browser/file_descriptor_info.h" 38 #include "content/public/browser/file_descriptor_info.h"
39 #endif 39 #endif
40 40
41 class GURL; 41 class GURL;
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // camera. Note that this does not query the user. |type| must be 643 // camera. Note that this does not query the user. |type| must be
644 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. 644 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
645 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, 645 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context,
646 const GURL& security_origin, 646 const GURL& security_origin,
647 MediaStreamType type); 647 MediaStreamType type);
648 }; 648 };
649 649
650 } // namespace content 650 } // namespace content
651 651
652 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 652 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/common/DEPS ('k') | content/public/test/async_file_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698