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

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

Issue 2618393003: Remove ScopedVector from ContentBrowserClient. (Closed)
Patch Set: rebase Created 3 years, 11 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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 const content::SocketPermissionRequest* params) override; 116 const content::SocketPermissionRequest* params) override;
117 bool IsPepperVpnProviderAPIAllowed(content::BrowserContext* browser_context, 117 bool IsPepperVpnProviderAPIAllowed(content::BrowserContext* browser_context,
118 const GURL& url) override; 118 const GURL& url) override;
119 content::TracingDelegate* GetTracingDelegate() override; 119 content::TracingDelegate* GetTracingDelegate() override;
120 void GetAdditionalMappedFilesForChildProcess( 120 void GetAdditionalMappedFilesForChildProcess(
121 const base::CommandLine& command_line, 121 const base::CommandLine& command_line,
122 int child_process_id, 122 int child_process_id,
123 content::FileDescriptorInfo* mappings) override; 123 content::FileDescriptorInfo* mappings) override;
124 void OverrideWebkitPrefs(content::RenderViewHost* rvh, 124 void OverrideWebkitPrefs(content::RenderViewHost* rvh,
125 content::WebPreferences* web_prefs) override; 125 content::WebPreferences* web_prefs) override;
126 ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation( 126 std::vector<std::unique_ptr<content::NavigationThrottle>>
127 CreateThrottlesForNavigation(
127 content::NavigationHandle* navigation_handle) override; 128 content::NavigationHandle* navigation_handle) override;
128 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 129 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
129 std::unique_ptr<base::Value> GetServiceManifestOverlay( 130 std::unique_ptr<base::Value> GetServiceManifestOverlay(
130 base::StringPiece name) override; 131 base::StringPiece name) override;
131 void RegisterRenderFrameMojoInterfaces( 132 void RegisterRenderFrameMojoInterfaces(
132 service_manager::InterfaceRegistry* registry, 133 service_manager::InterfaceRegistry* registry,
133 content::RenderFrameHost* render_frame_host) override; 134 content::RenderFrameHost* render_frame_host) override;
134 135
135 private: 136 private:
136 // Android WebView currently has a single global (non-off-the-record) browser 137 // Android WebView currently has a single global (non-off-the-record) browser
137 // context. 138 // context.
138 std::unique_ptr<AwBrowserContext> browser_context_; 139 std::unique_ptr<AwBrowserContext> browser_context_;
139 std::unique_ptr<AwWebPreferencesPopulater> preferences_populater_; 140 std::unique_ptr<AwWebPreferencesPopulater> preferences_populater_;
140 141
141 JniDependencyFactory* native_factory_; 142 JniDependencyFactory* native_factory_;
142 143
143 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 144 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
144 }; 145 };
145 146
146 } // namespace android_webview 147 } // namespace android_webview
147 148
148 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 149 #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