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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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
« no previous file with comments | « android_webview/browser/DEPS ('k') | ash/DEPS » ('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 #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 11 matching lines...) Expand all
22 #include "components/cdm/browser/cdm_message_filter_android.h" 22 #include "components/cdm/browser/cdm_message_filter_android.h"
23 #include "content/public/browser/access_token_store.h" 23 #include "content/public/browser/access_token_store.h"
24 #include "content/public/browser/browser_message_filter.h" 24 #include "content/public/browser/browser_message_filter.h"
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 #include "content/public/browser/child_process_security_policy.h" 26 #include "content/public/browser/child_process_security_policy.h"
27 #include "content/public/browser/render_process_host.h" 27 #include "content/public/browser/render_process_host.h"
28 #include "content/public/browser/render_view_host.h" 28 #include "content/public/browser/render_view_host.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/common/url_constants.h" 30 #include "content/public/common/url_constants.h"
31 #include "content/public/common/web_preferences.h" 31 #include "content/public/common/web_preferences.h"
32 #include "grit/ui_resources.h"
33 #include "net/android/network_library.h" 32 #include "net/android/network_library.h"
34 #include "net/ssl/ssl_cert_request_info.h" 33 #include "net/ssl/ssl_cert_request_info.h"
35 #include "net/ssl/ssl_info.h" 34 #include "net/ssl/ssl_info.h"
36 #include "ui/base/l10n/l10n_util_android.h" 35 #include "ui/base/l10n/l10n_util_android.h"
37 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
37 #include "ui/resources/grit/ui_resources.h"
38 38
39 using content::BrowserThread; 39 using content::BrowserThread;
40 using content::ResourceType; 40 using content::ResourceType;
41 41
42 namespace android_webview { 42 namespace android_webview {
43 namespace { 43 namespace {
44 44
45 // TODO(sgurun) move this to its own file. 45 // TODO(sgurun) move this to its own file.
46 // 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
47 // renderer process on the IPC thread. 47 // renderer process on the IPC thread.
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 582
583 #if defined(VIDEO_HOLE) 583 #if defined(VIDEO_HOLE)
584 content::ExternalVideoSurfaceContainer* 584 content::ExternalVideoSurfaceContainer*
585 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 585 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
586 content::WebContents* web_contents) { 586 content::WebContents* web_contents) {
587 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 587 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
588 } 588 }
589 #endif 589 #endif
590 590
591 } // namespace android_webview 591 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/DEPS ('k') | ash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698