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

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

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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 | Annotate | Revision Log
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/common/content_client.h" 19 #include "content/public/common/content_client.h"
20 #include "content/public/common/resource_type.h"
20 #include "content/public/common/socket_permission_request.h" 21 #include "content/public/common/socket_permission_request.h"
21 #include "content/public/common/window_container_type.h" 22 #include "content/public/common/window_container_type.h"
22 #include "net/base/mime_util.h" 23 #include "net/base/mime_util.h"
23 #include "net/cookies/canonical_cookie.h" 24 #include "net/cookies/canonical_cookie.h"
24 #include "net/url_request/url_request_interceptor.h" 25 #include "net/url_request/url_request_interceptor.h"
25 #include "net/url_request/url_request_job_factory.h" 26 #include "net/url_request/url_request_job_factory.h"
26 #include "third_party/WebKit/public/web/WebNotificationPresenter.h" 27 #include "third_party/WebKit/public/web/WebNotificationPresenter.h"
27 #include "ui/base/window_open_disposition.h" 28 #include "ui/base/window_open_disposition.h"
28 #include "webkit/browser/fileapi/file_system_context.h" 29 #include "webkit/browser/fileapi/file_system_context.h"
29 #include "webkit/common/resource_type.h"
30 30
31 #if defined(OS_POSIX) && !defined(OS_MACOSX) 31 #if defined(OS_POSIX) && !defined(OS_MACOSX)
32 #include "base/posix/global_descriptors.h" 32 #include "base/posix/global_descriptors.h"
33 #endif 33 #endif
34 34
35 #if defined(OS_POSIX) 35 #if defined(OS_POSIX)
36 #include "content/public/browser/file_descriptor_info.h" 36 #include "content/public/browser/file_descriptor_info.h"
37 #endif 37 #endif
38 38
39 class GURL; 39 class GURL;
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 647 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
648 // implementation. Return NULL to disable external surface video. 648 // implementation. Return NULL to disable external surface video.
649 virtual ExternalVideoSurfaceContainer* 649 virtual ExternalVideoSurfaceContainer*
650 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 650 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
651 #endif 651 #endif
652 }; 652 };
653 653
654 } // namespace content 654 } // namespace content
655 655
656 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 656 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698