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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/signin/gaia_auth_extension_loader.cc

Issue 120343004: Reland r242290, r241609, r242134. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/signin/signin_browsertest.cc » ('j') | chrome/common/profile_management_switches.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
index 6bd63bf6b6c76d0cf12838be70052935e942edbf..6d2f69b94daf27c20396b631735b6c908d31ed16 100644
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/profile_management_switches.h"
#include "content/public/browser/browser_thread.h"
#include "grit/browser_resources.h"
@@ -52,8 +51,7 @@ void LoadGaiaAuthExtension(Profile* profile) {
else if (command_line->HasSwitch(chromeos::switches::kEnableSamlSignin))
manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
#else
- if (switches::IsEnableInlineSignin())
- manifest_resource_id = IDR_GAIA_AUTH_INLINE_MANIFEST;
+ manifest_resource_id = IDR_GAIA_AUTH_INLINE_MANIFEST;
#endif
component_loader->Add(manifest_resource_id,
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/signin/signin_browsertest.cc » ('j') | chrome/common/profile_management_switches.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698