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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 372033002: Change semantics of newProfileManagement() to accountConsistency() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 (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 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 if (command_line->HasSwitch(switches::kInstantProcess)) 309 if (command_line->HasSwitch(switches::kInstantProcess))
310 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 310 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
311 311
312 if (command_line->HasSwitch(switches::kPlaybackMode) || 312 if (command_line->HasSwitch(switches::kPlaybackMode) ||
313 command_line->HasSwitch(switches::kRecordMode)) { 313 command_line->HasSwitch(switches::kRecordMode)) {
314 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 314 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
315 } 315 }
316 316
317 // TODO(guohui): needs to forward the new-profile-management switch to 317 // TODO(guohui): needs to forward the new-profile-management switch to
318 // renderer processes. 318 // renderer processes.
319 if (switches::IsNewProfileManagement()) 319 if (switches::IsEnableAccountConsistency())
320 thread->RegisterExtension(extensions_v8::PrincipalsExtension::Get()); 320 thread->RegisterExtension(extensions_v8::PrincipalsExtension::Get());
321 321
322 // chrome:, chrome-search:, chrome-devtools:, and chrome-distiller: pages 322 // chrome:, chrome-search:, chrome-devtools:, and chrome-distiller: pages
323 // should not be accessible by normal content, and should also be unable to 323 // should not be accessible by normal content, and should also be unable to
324 // script anything but themselves (to help limit the damage that a corrupt 324 // script anything but themselves (to help limit the damage that a corrupt
325 // page could cause). 325 // page could cause).
326 WebString chrome_ui_scheme(ASCIIToUTF16(content::kChromeUIScheme)); 326 WebString chrome_ui_scheme(ASCIIToUTF16(content::kChromeUIScheme));
327 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); 327 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
328 328
329 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme)); 329 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme));
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1428 CommandLine* command_line = CommandLine::ForCurrentProcess();
1429 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); 1429 return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
1430 } 1430 }
1431 1431
1432 blink::WebWorkerPermissionClientProxy* 1432 blink::WebWorkerPermissionClientProxy*
1433 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1433 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1434 content::RenderFrame* render_frame, 1434 content::RenderFrame* render_frame,
1435 blink::WebFrame* frame) { 1435 blink::WebFrame* frame) {
1436 return new WorkerPermissionClientProxy(render_frame, frame); 1436 return new WorkerPermissionClientProxy(render_frame, frame);
1437 } 1437 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698