Index: chrome/browser/managed_mode/managed_user_service.cc |
diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc |
index 054969cbbcb1ba0b99889467710c24e90db1ecc8..417ffaee99937c18da47299a090ee2e0724ec9bd 100644 |
--- a/chrome/browser/managed_mode/managed_user_service.cc |
+++ b/chrome/browser/managed_mode/managed_user_service.cc |
@@ -129,6 +129,9 @@ bool ManagedUserService::IsPassphraseEmpty() const { |
bool ManagedUserService::CanSkipPassphraseDialog( |
const content::WebContents* web_contents) const { |
+#if defined(OS_CHROMEOS) |
+ return false; |
Adrian Kuegel
2013/04/11 15:56:10
I could add a DCHECK here, too, if I modify the co
|
+#endif |
return IsElevatedForWebContents(web_contents) || |
IsPassphraseEmpty(); |
} |
@@ -136,6 +139,11 @@ bool ManagedUserService::CanSkipPassphraseDialog( |
void ManagedUserService::RequestAuthorization( |
content::WebContents* web_contents, |
const PassphraseCheckedCallback& callback) { |
+#if defined(OS_CHROMEOS) |
+ callback.Run(false); |
Bernhard Bauer
2013/04/11 13:31:18
Again, should we maybe DCHECK?
Adrian Kuegel
2013/04/11 15:56:10
If I add a DCHECK here, I would have to also chang
|
+ return; |
+#endif |
+ |
if (CanSkipPassphraseDialog(web_contents)) { |
callback.Run(true); |
return; |
@@ -413,12 +421,16 @@ void ManagedUserService::GetManualExceptionsForHost(const std::string& host, |
void ManagedUserService::AddElevationForExtension( |
const std::string& extension_id) { |
+#if !defined(OS_CHROMEOS) |
elevated_for_extensions_.insert(extension_id); |
Bernhard Bauer
2013/04/11 13:31:18
And here
|
+#endif |
} |
void ManagedUserService::RemoveElevationForExtension( |
const std::string& extension_id) { |
+#if !defined(OS_CHROMEOS) |
elevated_for_extensions_.erase(extension_id); |
Bernhard Bauer
2013/04/11 13:31:18
And here
|
+#endif |
} |
void ManagedUserService::Init() { |