summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/usb_mount_observer.cc
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 20:32:05 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 20:32:05 +0000
commit6ba198fd7a578d370215fd5816962286070f9b3c (patch)
tree57dd8d3c58f118af9d6881f349bcdccb42935aa1 /chrome/browser/chromeos/usb_mount_observer.cc
parent277bcc7aa162b6d92b01bdcad3bd76e2bb4a7cf6 (diff)
downloadchromium_src-6ba198fd7a578d370215fd5816962286070f9b3c.zip
chromium_src-6ba198fd7a578d370215fd5816962286070f9b3c.tar.gz
chromium_src-6ba198fd7a578d370215fd5816962286070f9b3c.tar.bz2
Moving mediaplayer and filebrowser behind a preference. This just adds the preference and sets its default value to false. After this we'll have to add the UI to set it.
BUG=4362 TEST=none Review URL: http://codereview.chromium.org/2873032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/usb_mount_observer.cc')
-rw-r--r--chrome/browser/chromeos/usb_mount_observer.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc
index 890b8af..d0e329f 100644
--- a/chrome/browser/chromeos/usb_mount_observer.cc
+++ b/chrome/browser/chromeos/usb_mount_observer.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/dom_ui/filebrowse_ui.h"
+#include "chrome/browser/pref_service.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/url_constants.h"
@@ -52,6 +53,10 @@ void USBMountObserver::OpenFileBrowse(const std::string& url,
Browser* browser;
Profile* profile;
profile = BrowserList::GetLastActive()->profile();
+ PrefService* pref_service = profile->GetPrefs();
+ if (!pref_service->GetBoolean(prefs::kLabsAdvancedFilesystemEnabled)) {
+ return;
+ }
if (small) {
browser = FileBrowseUI::OpenPopup(profile,
url,