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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

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 #include "android_webview/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 19 matching lines...) Expand all
30 #include "content/public/common/url_constants.h" 30 #include "content/public/common/url_constants.h"
31 #include "grit/ui_resources.h" 31 #include "grit/ui_resources.h"
32 #include "net/android/network_library.h" 32 #include "net/android/network_library.h"
33 #include "net/ssl/ssl_cert_request_info.h" 33 #include "net/ssl/ssl_cert_request_info.h"
34 #include "net/ssl/ssl_info.h" 34 #include "net/ssl/ssl_info.h"
35 #include "ui/base/l10n/l10n_util_android.h" 35 #include "ui/base/l10n/l10n_util_android.h"
36 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
37 #include "webkit/common/webpreferences.h" 37 #include "webkit/common/webpreferences.h"
38 38
39 using content::BrowserThread; 39 using content::BrowserThread;
40 using content::ResourceType;
40 41
41 namespace android_webview { 42 namespace android_webview {
42 namespace { 43 namespace {
43 44
44 // TODO(sgurun) move this to its own file. 45 // TODO(sgurun) move this to its own file.
45 // This class filters out incoming aw_contents related IPC messages for the 46 // This class filters out incoming aw_contents related IPC messages for the
46 // renderer process on the IPC thread. 47 // renderer process on the IPC thread.
47 class AwContentsMessageFilter : public content::BrowserMessageFilter { 48 class AwContentsMessageFilter : public content::BrowserMessageFilter {
48 public: 49 public:
49 explicit AwContentsMessageFilter(int process_id); 50 explicit AwContentsMessageFilter(int process_id);
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 586
586 #if defined(VIDEO_HOLE) 587 #if defined(VIDEO_HOLE)
587 content::ExternalVideoSurfaceContainer* 588 content::ExternalVideoSurfaceContainer*
588 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 589 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
589 content::WebContents* web_contents) { 590 content::WebContents* web_contents) {
590 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 591 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
591 } 592 }
592 #endif 593 #endif
593 594
594 } // namespace android_webview 595 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698