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

Unified Diff: chrome/browser/extensions/file_manager_util.cc

Issue 7941014: Use extension-based file picker from CrOS for Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_touchui Created 9 years, 3 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/extensions/file_manager_util.cc
diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc
index 25f91ce7ee33bac1ff621f541f5ffbf1aff8f213..5739d22ceff5cc127abe4c4ca59ccbbacf2e7a47 100644
--- a/chrome/browser/extensions/file_manager_util.cc
+++ b/chrome/browser/extensions/file_manager_util.cc
@@ -9,7 +9,6 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/media/media_player.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/simple_message_box.h"
#include "chrome/browser/ui/browser.h"
@@ -24,6 +23,10 @@
#include "webkit/fileapi/file_system_mount_point_provider.h"
#include "webkit/fileapi/file_system_util.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/media/media_player.h"
+#endif
+
#define FILEBROWSER_DOMAIN "hhaomjibdihmijegdhdafkllkbggdgoj"
const char kFileBrowserDomain[] = FILEBROWSER_DOMAIN;
#define FILEBROWSER_URL(PATH) \
@@ -238,6 +241,7 @@ void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
browser->AddSelectedTabWithURL(GURL(path), PageTransition::LINK);
return;
}
+#if defined(OS_CHROMEOS)
if (IsSupportedAVExtension(ext.data())) {
Browser* browser = BrowserList::GetLastActive();
if (!browser)
@@ -249,6 +253,7 @@ void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
mediaplayer->ForcePlayMediaFile(browser->profile(), full_path, NULL);
return;
}
+#endif // OS_CHROMEOS
// Unknown file type. Record UMA and show an error message.
size_t extension_index = UMAExtensionIndex(ext.data(),
« no previous file with comments | « chrome/browser/extensions/extension_file_browser_private_api.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698