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

Side by Side Diff: chrome/browser/chrome_content_browser_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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 #endif 878 #endif
879 #if !defined(DISABLE_NACL) 879 #if !defined(DISABLE_NACL)
880 host->AddFilter(new nacl::NaClHostMessageFilter( 880 host->AddFilter(new nacl::NaClHostMessageFilter(
881 id, profile->IsOffTheRecord(), 881 id, profile->IsOffTheRecord(),
882 profile->GetPath(), 882 profile->GetPath(),
883 context)); 883 context));
884 #endif 884 #endif
885 #if defined(OS_ANDROID) 885 #if defined(OS_ANDROID)
886 host->AddFilter(new cdm::CdmMessageFilterAndroid()); 886 host->AddFilter(new cdm::CdmMessageFilterAndroid());
887 #endif 887 #endif
888 if (switches::IsNewProfileManagement()) 888 if (switches::IsEnableAccountConsistency())
889 host->AddFilter(new PrincipalsMessageFilter(id)); 889 host->AddFilter(new PrincipalsMessageFilter(id));
890 890
891 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 891 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
892 profile->IsOffTheRecord())); 892 profile->IsOffTheRecord()));
893 893
894 #if defined(ENABLE_EXTENSIONS) 894 #if defined(ENABLE_EXTENSIONS)
895 SendExtensionWebRequestStatusToHost(host); 895 SendExtensionWebRequestStatusToHost(host);
896 #endif 896 #endif
897 897
898 RendererContentSettingRules rules; 898 RendererContentSettingRules rules;
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
2800 switches::kDisableWebRtcEncryption, 2800 switches::kDisableWebRtcEncryption,
2801 }; 2801 };
2802 to_command_line->CopySwitchesFrom(from_command_line, 2802 to_command_line->CopySwitchesFrom(from_command_line,
2803 kWebRtcDevSwitchNames, 2803 kWebRtcDevSwitchNames,
2804 arraysize(kWebRtcDevSwitchNames)); 2804 arraysize(kWebRtcDevSwitchNames));
2805 } 2805 }
2806 } 2806 }
2807 #endif // defined(ENABLE_WEBRTC) 2807 #endif // defined(ENABLE_WEBRTC)
2808 2808
2809 } // namespace chrome 2809 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698