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

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

Issue 1350913008: Revert of Add a NavigationThrottle to the public content/ interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation-api
Patch Set: Created 5 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 | « 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 const GURL& url, 135 const GURL& url,
136 bool private_api, 136 bool private_api,
137 const content::SocketPermissionRequest* params) override; 137 const content::SocketPermissionRequest* params) override;
138 void GetAdditionalMappedFilesForChildProcess( 138 void GetAdditionalMappedFilesForChildProcess(
139 const base::CommandLine& command_line, 139 const base::CommandLine& command_line,
140 int child_process_id, 140 int child_process_id,
141 content::FileDescriptorInfo* mappings, 141 content::FileDescriptorInfo* mappings,
142 std::map<int, base::MemoryMappedFile::Region>* regions) override; 142 std::map<int, base::MemoryMappedFile::Region>* regions) override;
143 void OverrideWebkitPrefs(content::RenderViewHost* rvh, 143 void OverrideWebkitPrefs(content::RenderViewHost* rvh,
144 content::WebPreferences* web_prefs) override; 144 content::WebPreferences* web_prefs) override;
145 ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation(
146 content::NavigationHandle* navigation_handle) override;
147 #if defined(VIDEO_HOLE) 145 #if defined(VIDEO_HOLE)
148 content::ExternalVideoSurfaceContainer* 146 content::ExternalVideoSurfaceContainer*
149 OverrideCreateExternalVideoSurfaceContainer( 147 OverrideCreateExternalVideoSurfaceContainer(
150 content::WebContents* web_contents) override; 148 content::WebContents* web_contents) override;
151 #endif 149 #endif
152 150
153 private: 151 private:
154 // Android WebView currently has a single global (non-off-the-record) browser 152 // Android WebView currently has a single global (non-off-the-record) browser
155 // context. 153 // context.
156 scoped_ptr<AwBrowserContext> browser_context_; 154 scoped_ptr<AwBrowserContext> browser_context_;
157 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; 155 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
158 156
159 JniDependencyFactory* native_factory_; 157 JniDependencyFactory* native_factory_;
160 158
161 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 159 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
162 }; 160 };
163 161
164 } // namespace android_webview 162 } // namespace android_webview
165 163
166 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 164 #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