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

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

Issue 884073002: Implement chrome.platformKeys.getKeyPair(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_impl2
Patch Set: Rebased. 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 source_map->RegisterSource("mediaGalleries", 184 source_map->RegisterSource("mediaGalleries",
185 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS); 185 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
186 source_map->RegisterSource("notifications", 186 source_map->RegisterSource("notifications",
187 IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS); 187 IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS);
188 source_map->RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS); 188 source_map->RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
189 source_map->RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS); 189 source_map->RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS);
190 source_map->RegisterSource("pageCapture", 190 source_map->RegisterSource("pageCapture",
191 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS); 191 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS);
192 source_map->RegisterSource("platformKeys", 192 source_map->RegisterSource("platformKeys",
193 IDR_PLATFORM_KEYS_CUSTOM_BINDINGS_JS); 193 IDR_PLATFORM_KEYS_CUSTOM_BINDINGS_JS);
194 source_map->RegisterSource("platformKeys.getPublicKey",
195 IDR_PLATFORM_KEYS_GET_PUBLIC_KEY_JS);
194 source_map->RegisterSource("platformKeys.internalAPI", 196 source_map->RegisterSource("platformKeys.internalAPI",
195 IDR_PLATFORM_KEYS_INTERNAL_API_JS); 197 IDR_PLATFORM_KEYS_INTERNAL_API_JS);
196 source_map->RegisterSource("platformKeys.Key", IDR_PLATFORM_KEYS_KEY_JS); 198 source_map->RegisterSource("platformKeys.Key", IDR_PLATFORM_KEYS_KEY_JS);
197 source_map->RegisterSource("platformKeys.SubtleCrypto", 199 source_map->RegisterSource("platformKeys.SubtleCrypto",
198 IDR_PLATFORM_KEYS_SUBTLE_CRYPTO_JS); 200 IDR_PLATFORM_KEYS_SUBTLE_CRYPTO_JS);
199 source_map->RegisterSource("platformKeys.utils", IDR_PLATFORM_KEYS_UTILS_JS); 201 source_map->RegisterSource("platformKeys.utils", IDR_PLATFORM_KEYS_UTILS_JS);
200 source_map->RegisterSource("syncFileSystem", 202 source_map->RegisterSource("syncFileSystem",
201 IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS); 203 IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
202 source_map->RegisterSource("systemIndicator", 204 source_map->RegisterSource("systemIndicator",
203 IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS); 205 IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 277 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
276 ::switches::kSingleProcess)) 278 ::switches::kSingleProcess))
277 return; 279 return;
278 crash_keys::SetActiveExtensions(extension_ids); 280 crash_keys::SetActiveExtensions(extension_ids);
279 } 281 }
280 282
281 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) { 283 void ChromeExtensionsDispatcherDelegate::SetChannel(int channel) {
282 extensions::SetCurrentChannel( 284 extensions::SetCurrentChannel(
283 static_cast<chrome::VersionInfo::Channel>(channel)); 285 static_cast<chrome::VersionInfo::Channel>(channel));
284 } 286 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698