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

Side by Side Diff: chrome/browser/extensions/signin/gaia_auth_extension_loader.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/signin/gaia_auth_extension_loader.h" 5 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path); 51 component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
52 return; 52 return;
53 } 53 }
54 54
55 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
56 int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST; 56 int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
57 if (chromeos::system::InputDeviceSettings::Get() 57 if (chromeos::system::InputDeviceSettings::Get()
58 ->ForceKeyboardDrivenUINavigation()) { 58 ->ForceKeyboardDrivenUINavigation()) {
59 manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST; 59 manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST;
60 } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin) || 60 } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin) ||
61 (switches::IsNewProfileManagement() && 61 (switches::IsEnableAccountConsistency() &&
62 context->GetPath() != 62 context->GetPath() !=
63 chromeos::ProfileHelper::GetSigninProfileDir())) { 63 chromeos::ProfileHelper::GetSigninProfileDir())) {
64 manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST; 64 manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
65 } 65 }
66 #else 66 #else
67 int manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST; 67 int manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
68 #endif 68 #endif
69 69
70 component_loader->Add(manifest_resource_id, 70 component_loader->Add(manifest_resource_id,
71 base::FilePath(FILE_PATH_LITERAL("gaia_auth"))); 71 base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader> > g_factory = 131 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader> > g_factory =
132 LAZY_INSTANCE_INITIALIZER; 132 LAZY_INSTANCE_INITIALIZER;
133 133
134 // static 134 // static
135 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>* 135 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>*
136 GaiaAuthExtensionLoader::GetFactoryInstance() { 136 GaiaAuthExtensionLoader::GetFactoryInstance() {
137 return g_factory.Pointer(); 137 return g_factory.Pointer();
138 } 138 }
139 139
140 } // namespace extensions 140 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698