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: android_webview/browser/aw_content_browser_client.h

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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 | « no previous file | android_webview/browser/aw_content_browser_client.cc » ('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 ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "android_webview/browser/aw_web_preferences_populater.h" 8 #include "android_webview/browser/aw_web_preferences_populater.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 18 matching lines...) Expand all
29 29
30 // Overriden methods from ContentBrowserClient. 30 // Overriden methods from ContentBrowserClient.
31 virtual void AddCertificate(net::CertificateMimeType cert_type, 31 virtual void AddCertificate(net::CertificateMimeType cert_type,
32 const void* cert_data, 32 const void* cert_data,
33 size_t cert_size, 33 size_t cert_size,
34 int render_process_id, 34 int render_process_id,
35 int render_frame_id) override; 35 int render_frame_id) override;
36 virtual content::BrowserMainParts* CreateBrowserMainParts( 36 virtual content::BrowserMainParts* CreateBrowserMainParts(
37 const content::MainFunctionParams& parameters) override; 37 const content::MainFunctionParams& parameters) override;
38 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( 38 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
39 content::WebContents* web_contents) override; 39 content::WebContents* web_contents,
40 gfx::NativeView context) override;
40 virtual void RenderProcessWillLaunch( 41 virtual void RenderProcessWillLaunch(
41 content::RenderProcessHost* host) override; 42 content::RenderProcessHost* host) override;
42 virtual net::URLRequestContextGetter* CreateRequestContext( 43 virtual net::URLRequestContextGetter* CreateRequestContext(
43 content::BrowserContext* browser_context, 44 content::BrowserContext* browser_context,
44 content::ProtocolHandlerMap* protocol_handlers, 45 content::ProtocolHandlerMap* protocol_handlers,
45 content::URLRequestInterceptorScopedVector request_interceptors) override; 46 content::URLRequestInterceptorScopedVector request_interceptors) override;
46 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 47 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
47 content::BrowserContext* browser_context, 48 content::BrowserContext* browser_context,
48 const base::FilePath& partition_path, 49 const base::FilePath& partition_path,
49 bool in_memory, 50 bool in_memory,
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; 188 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
188 189
189 JniDependencyFactory* native_factory_; 190 JniDependencyFactory* native_factory_;
190 191
191 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 192 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
192 }; 193 };
193 194
194 } // namespace android_webview 195 } // namespace android_webview
195 196
196 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 197 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/aw_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698