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

Unified Diff: chrome/browser/managed_mode/managed_mode_navigation_observer.cc

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unlock buttons. 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
Index: chrome/browser/managed_mode/managed_mode_navigation_observer.cc
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
index ce1d91834f92b4ed4c3289556947babd40708948..15e357d8fe444d974c575b902fd347332828105c 100644
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
@@ -333,11 +333,17 @@ void ManagedModeNavigationObserver::AddSavedURLsToWhitelistAndClearState() {
}
bool ManagedModeNavigationObserver::is_elevated() const {
+#if defined(OS_CHROMEOS)
+ return false;
+#else
return is_elevated_;
+#endif
}
void ManagedModeNavigationObserver::set_elevated(bool is_elevated) {
+#if !defined(OS_CHROMEOS)
is_elevated_ = is_elevated;
Bernhard Bauer 2013/04/11 13:31:18 Hmm, could we DCHECK in that case?
Adrian Kuegel 2013/04/11 15:56:10 Yes, that should work. But it implies I need to ch
+#endif
}
void ManagedModeNavigationObserver::AddURLToPatternList(const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698