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

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

Issue 927883002: Implement chrome.platformKeys.getKeyPair(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 source_map->RegisterSource("mediaGalleries", 183 source_map->RegisterSource("mediaGalleries",
184 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS); 184 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
185 source_map->RegisterSource("notifications", 185 source_map->RegisterSource("notifications",
186 IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS); 186 IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS);
187 source_map->RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS); 187 source_map->RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
188 source_map->RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS); 188 source_map->RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS);
189 source_map->RegisterSource("pageCapture", 189 source_map->RegisterSource("pageCapture",
190 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS); 190 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS);
191 source_map->RegisterSource("platformKeys", 191 source_map->RegisterSource("platformKeys",
192 IDR_PLATFORM_KEYS_CUSTOM_BINDINGS_JS); 192 IDR_PLATFORM_KEYS_CUSTOM_BINDINGS_JS);
193 source_map->RegisterSource("platformKeys.getPublicKey",
194 IDR_PLATFORM_KEYS_GET_PUBLIC_KEY_JS);
193 source_map->RegisterSource("platformKeys.internalAPI", 195 source_map->RegisterSource("platformKeys.internalAPI",
194 IDR_PLATFORM_KEYS_INTERNAL_API_JS); 196 IDR_PLATFORM_KEYS_INTERNAL_API_JS);
195 source_map->RegisterSource("platformKeys.Key", IDR_PLATFORM_KEYS_KEY_JS); 197 source_map->RegisterSource("platformKeys.Key", IDR_PLATFORM_KEYS_KEY_JS);
196 source_map->RegisterSource("platformKeys.SubtleCrypto", 198 source_map->RegisterSource("platformKeys.SubtleCrypto",
197 IDR_PLATFORM_KEYS_SUBTLE_CRYPTO_JS); 199 IDR_PLATFORM_KEYS_SUBTLE_CRYPTO_JS);
198 source_map->RegisterSource("platformKeys.utils", IDR_PLATFORM_KEYS_UTILS_JS); 200 source_map->RegisterSource("platformKeys.utils", IDR_PLATFORM_KEYS_UTILS_JS);
199 source_map->RegisterSource("syncFileSystem", 201 source_map->RegisterSource("syncFileSystem",
200 IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS); 202 IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
201 source_map->RegisterSource("systemIndicator", 203 source_map->RegisterSource("systemIndicator",
202 IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS); 204 IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 276 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
275 ::switches::kSingleProcess)) 277 ::switches::kSingleProcess))
276 return; 278 return;
277 crash_keys::SetActiveExtensions(extension_ids); 279 crash_keys::SetActiveExtensions(extension_ids);
278 } 280 }
279 281
280 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) { 282 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) {
281 extensions::SetCurrentChannel( 283 extensions::SetCurrentChannel(
282 static_cast<chrome::VersionInfo::Channel>(channel)); 284 static_cast<chrome::VersionInfo::Channel>(channel));
283 } 285 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/platform_keys_internal.idl ('k') | chrome/renderer/extensions/platform_keys_natives.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698