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

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

Issue 298073009: Reuse WebCrypto's normalizeCryptoAlgorithm in enterprise.platformKeys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
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/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/chrome_version_info.h" 11 #include "chrome/common/chrome_version_info.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/renderer/extensions/app_bindings.h" 15 #include "chrome/renderer/extensions/app_bindings.h"
16 #include "chrome/renderer/extensions/app_window_custom_bindings.h" 16 #include "chrome/renderer/extensions/app_window_custom_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/chrome_v8_context.h" 18 #include "chrome/renderer/extensions/chrome_v8_context.h"
19 #include "chrome/renderer/extensions/enterprise_platform_keys_natives.h"
19 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h" 20 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h"
20 #include "chrome/renderer/extensions/file_browser_private_custom_bindings.h" 21 #include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"
21 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h" 22 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h"
22 #include "chrome/renderer/extensions/page_actions_custom_bindings.h" 23 #include "chrome/renderer/extensions/page_actions_custom_bindings.h"
23 #include "chrome/renderer/extensions/page_capture_custom_bindings.h" 24 #include "chrome/renderer/extensions/page_capture_custom_bindings.h"
24 #include "chrome/renderer/extensions/pepper_request_natives.h" 25 #include "chrome/renderer/extensions/pepper_request_natives.h"
25 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h" 26 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h"
26 #include "chrome/renderer/extensions/tab_finder.h" 27 #include "chrome/renderer/extensions/tab_finder.h"
27 #include "chrome/renderer/extensions/tabs_custom_bindings.h" 28 #include "chrome/renderer/extensions/tabs_custom_bindings.h"
28 #include "chrome/renderer/extensions/webstore_bindings.h" 29 #include "chrome/renderer/extensions/webstore_bindings.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 new extensions::AppBindings(dispatcher, context))); 97 new extensions::AppBindings(dispatcher, context)));
97 module_system->RegisterNativeHandler( 98 module_system->RegisterNativeHandler(
98 "app_window_natives", 99 "app_window_natives",
99 scoped_ptr<NativeHandler>( 100 scoped_ptr<NativeHandler>(
100 new extensions::AppWindowCustomBindings(dispatcher, context))); 101 new extensions::AppWindowCustomBindings(dispatcher, context)));
101 module_system->RegisterNativeHandler( 102 module_system->RegisterNativeHandler(
102 "sync_file_system", 103 "sync_file_system",
103 scoped_ptr<NativeHandler>( 104 scoped_ptr<NativeHandler>(
104 new extensions::SyncFileSystemCustomBindings(context))); 105 new extensions::SyncFileSystemCustomBindings(context)));
105 module_system->RegisterNativeHandler( 106 module_system->RegisterNativeHandler(
107 "enterprise_platform_keys_natives",
108 scoped_ptr<NativeHandler>(
109 new extensions::EnterprisePlatformKeysNatives(context)));
110 module_system->RegisterNativeHandler(
106 "file_browser_handler", 111 "file_browser_handler",
107 scoped_ptr<NativeHandler>( 112 scoped_ptr<NativeHandler>(
108 new extensions::FileBrowserHandlerCustomBindings(context))); 113 new extensions::FileBrowserHandlerCustomBindings(context)));
109 module_system->RegisterNativeHandler( 114 module_system->RegisterNativeHandler(
110 "file_browser_private", 115 "file_browser_private",
111 scoped_ptr<NativeHandler>( 116 scoped_ptr<NativeHandler>(
112 new extensions::FileBrowserPrivateCustomBindings(context))); 117 new extensions::FileBrowserPrivateCustomBindings(context)));
113 module_system->RegisterNativeHandler( 118 module_system->RegisterNativeHandler(
114 "mediaGalleries", 119 "mediaGalleries",
115 scoped_ptr<NativeHandler>( 120 scoped_ptr<NativeHandler>(
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } 370 }
366 371
367 void ChromeExtensionsDispatcherDelegate::HandleWebRequestAPIUsage( 372 void ChromeExtensionsDispatcherDelegate::HandleWebRequestAPIUsage(
368 bool adblock, 373 bool adblock,
369 bool adblock_plus, 374 bool adblock_plus,
370 bool other) { 375 bool other) {
371 webrequest_adblock_ = adblock; 376 webrequest_adblock_ = adblock;
372 webrequest_adblock_plus_ = adblock_plus; 377 webrequest_adblock_plus_ = adblock_plus;
373 webrequest_other_ = other; 378 webrequest_other_ = other;
374 } 379 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698