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

Side by Side Diff: chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

Issue 1312653003: Fix for WebView accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments by kalman@. 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 5 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/sha1.h" 8 #include "base/sha1.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "chrome/common/channel_info.h" 10 #include "chrome/common/channel_info.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/crash_keys.h" 12 #include "chrome/common/crash_keys.h"
13 #include "chrome/common/extensions/features/feature_channel.h" 13 #include "chrome/common/extensions/features/feature_channel.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "chrome/grit/renderer_resources.h" 15 #include "chrome/grit/renderer_resources.h"
16 #include "chrome/renderer/extensions/app_bindings.h" 16 #include "chrome/renderer/extensions/app_bindings.h"
17 #include "chrome/renderer/extensions/automation_internal_custom_bindings.h" 17 #include "chrome/renderer/extensions/automation_internal_custom_bindings.h"
18 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h" 18 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h"
19 #include "chrome/renderer/extensions/file_manager_private_custom_bindings.h" 19 #include "chrome/renderer/extensions/file_manager_private_custom_bindings.h"
20 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h" 20 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h"
21 #include "chrome/renderer/extensions/notifications_native_handler.h" 21 #include "chrome/renderer/extensions/notifications_native_handler.h"
22 #include "chrome/renderer/extensions/page_capture_custom_bindings.h" 22 #include "chrome/renderer/extensions/page_capture_custom_bindings.h"
23 #include "chrome/renderer/extensions/platform_keys_natives.h" 23 #include "chrome/renderer/extensions/platform_keys_natives.h"
24 #include "chrome/renderer/extensions/resource_request_policy.h"
24 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h" 25 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h"
25 #include "chrome/renderer/extensions/tabs_custom_bindings.h" 26 #include "chrome/renderer/extensions/tabs_custom_bindings.h"
26 #include "chrome/renderer/extensions/webstore_bindings.h" 27 #include "chrome/renderer/extensions/webstore_bindings.h"
27 #include "components/version_info/version_info.h" 28 #include "components/version_info/version_info.h"
28 #include "content/public/renderer/render_thread.h" 29 #include "content/public/renderer/render_thread.h"
29 #include "content/public/renderer/render_view.h" 30 #include "content/public/renderer/render_view.h"
30 #include "extensions/common/extension.h" 31 #include "extensions/common/extension.h"
31 #include "extensions/common/feature_switch.h" 32 #include "extensions/common/feature_switch.h"
32 #include "extensions/common/permissions/manifest_permission_set.h" 33 #include "extensions/common/permissions/manifest_permission_set.h"
33 #include "extensions/common/permissions/permission_set.h" 34 #include "extensions/common/permissions/permission_set.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // In single-process mode, the browser process reports the active extensions. 252 // In single-process mode, the browser process reports the active extensions.
252 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 253 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
253 ::switches::kSingleProcess)) 254 ::switches::kSingleProcess))
254 return; 255 return;
255 crash_keys::SetActiveExtensions(extension_ids); 256 crash_keys::SetActiveExtensions(extension_ids);
256 } 257 }
257 258
258 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) { 259 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) {
259 extensions::SetCurrentChannel(static_cast<version_info::Channel>(channel)); 260 extensions::SetCurrentChannel(static_cast<version_info::Channel>(channel));
260 } 261 }
262
263 void ChromeExtensionsDispatcherDelegate::SetWebViewPartitionID(
264 const std::string& partition_id) {
265 extensions::ResourceRequestPolicy::SetWebViewPartitionID(partition_id);
266 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698