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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/component_loader.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 83026ed3ce6842214ef186c65e50f4c0f73b8ea4..39b3b579a5da5133412189b33e51929c34c4ba0b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -210,7 +210,7 @@
#include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui.h"
#endif
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/file_manager/app_id.h"
#endif
@@ -2314,7 +2314,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
web_prefs->accelerated_compositing_enabled = false;
}
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
// Override the default of suppressing HW compositing for WebUI pages for the
// file manager, which is implemented using WebUI but wants HW acceleration
// for video decode & render.
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698