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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deal with new enterprise_platform_keys_private_api Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1b410274883ee06759595d55c49c00df9d9fafaa..c55c6be46ee43a6a16f9dbbc1e6d46e7e095867b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -65,8 +65,6 @@
#include "chrome/browser/search/instant_service_factory.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
-#include "chrome/browser/signin/signin_manager.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
#include "chrome/browser/spellchecker/spellcheck_message_filter.h"
#include "chrome/browser/ssl/ssl_add_certificate.h"
@@ -167,6 +165,11 @@
#include "chrome/browser/ui/crypto_module_password_dialog.h"
#endif
+#if !defined(OS_CHROMEOS)
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
+#endif
+
using base::FileDescriptor;
using content::AccessTokenStore;
using content::BrowserChildProcessHostIterator;
@@ -457,6 +460,7 @@ GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
return effective_url;
}
+#if !defined(OS_CHROMEOS)
GURL GetEffectiveURLForSignin(const GURL& url) {
CHECK(SigninManager::IsWebBasedSigninFlowURL(url));
@@ -469,6 +473,7 @@ GURL GetEffectiveURLForSignin(const GURL& url) {
effective_url = effective_url.ReplaceComponents(replacements);
return effective_url;
}
+#endif
void SetApplicationLocaleOnIOThread(const std::string& locale) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -742,12 +747,14 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
if (chrome::ShouldAssignURLToInstantRenderer(url, profile))
return GetEffectiveURLForInstant(url, profile);
+#if !defined(OS_CHROMEOS)
// If the input |url| should be assigned to the Signin renderer, make its
// effective URL distinct from other URLs on the signin service's domain.
// Note that the signin renderer will be allowed to sign the user in to
// Chrome.
if (SigninManager::IsWebBasedSigninFlowURL(url))
return GetEffectiveURLForSignin(url);
+#endif
// If the input |url| is part of an installed app, the effective URL is an
// extension URL with the ID of that extension as the host. This has the
@@ -786,8 +793,10 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
if (chrome::ShouldAssignURLToInstantRenderer(effective_url, profile))
return true;
+#if !defined(OS_CHROMEOS)
if (SigninManager::IsWebBasedSigninFlowURL(effective_url))
return true;
+#endif
if (!effective_url.SchemeIs(extensions::kExtensionScheme))
return false;
@@ -871,9 +880,11 @@ bool ChromeContentBrowserClient::IsSuitableHost(
return is_instant_process && should_be_in_instant_process;
}
+#if !defined(OS_CHROMEOS)
SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile);
if (signin_manager && signin_manager->IsSigninProcess(process_host->GetID()))
return SigninManager::IsWebBasedSigninFlowURL(site_url);
+#endif
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
@@ -971,6 +982,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
instant_service->AddInstantProcess(site_instance->GetProcess()->GetID());
}
+#if !defined(OS_CHROMEOS)
// We only expect there to be one signin process as we use process-per-site
// for signin URLs. The signin process will be cleared from SigninManager
// when the renderer is destroyed.
@@ -980,6 +992,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
if (signin_manager)
signin_manager->SetSigninProcess(site_instance->GetProcess()->GetID());
}
+#endif
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
@@ -1174,10 +1187,12 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
instant_service->IsInstantProcess(process->GetID()))
command_line->AppendSwitch(switches::kInstantProcess);
+#if !defined(OS_CHROMEOS)
SigninManager* signin_manager =
SigninManagerFactory::GetForProfile(profile);
if (signin_manager && signin_manager->IsSigninProcess(process->GetID()))
command_line->AppendSwitch(switches::kSigninProcess);
+#endif
}
if (content::IsThreadedCompositingEnabled())
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698