diff options
author | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:47:34 +0000 |
---|---|---|
committer | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:47:34 +0000 |
commit | 0f4b9ac1eaa8fca3c58c2a593ae093ed66bb89a5 (patch) | |
tree | c9d4dec1721cf22b16cbb0b173c5cd180a65ad19 | |
parent | 8a3a8d6b5fe7e159accdcecb96f18de4959aef80 (diff) | |
download | chromium_src-0f4b9ac1eaa8fca3c58c2a593ae093ed66bb89a5.zip chromium_src-0f4b9ac1eaa8fca3c58c2a593ae093ed66bb89a5.tar.gz chromium_src-0f4b9ac1eaa8fca3c58c2a593ae093ed66bb89a5.tar.bz2 |
Removed 'offline' item from drive root.
BUG=237419
Review URL: https://chromiumcodereview.appspot.com/14679006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198988 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc index 857eb10..51b9616 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc @@ -820,7 +820,8 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenRecent) { ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); } -IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenOffline) { +// TODO(hirono): Bring back the offline feature. http://crbug.com/238545 +IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, DISABLED_TestOpenOffline) { ASSERT_TRUE(PrepareVolume()); ResultCatcher catcher; StartTest("openSidebarOffline"); diff --git a/chrome/browser/resources/file_manager/js/directory_model.js b/chrome/browser/resources/file_manager/js/directory_model.js index 527e9f8..9e8d863 100644 --- a/chrome/browser/resources/file_manager/js/directory_model.js +++ b/chrome/browser/resources/file_manager/js/directory_model.js @@ -110,15 +110,14 @@ DirectoryModel.fakeDriveRecentEntry_ = { /** * List of fake entries for special searches. * TODO(haruki): Add the entry for "Recent". + * TODO(hirono): Bring back the entry for "Offline". http://crbug.com/238545 * * @type {Array.<Object>} * @const - * @private */ -DirectoryModel.fakeDriveSpecialSearchEntries_ = +DirectoryModel.FAKE_DRIVE_SPECIAL_SEARCH_ENTRIES = [DirectoryModel.fakeDriveSharedWithMeEntry_, - DirectoryModel.fakeDriveRecentEntry_, - DirectoryModel.fakeDriveOfflineEntry_]; + DirectoryModel.fakeDriveRecentEntry_]; /** * DirectoryModel extends cr.EventTarget. @@ -1122,7 +1121,7 @@ DirectoryModel.prototype.resolveRoots_ = function(callback) { if (this.driveEnabled_) { if (!util.platform.newUI()) { groups.driveSpecialSearchRoots = this.showSpecialSearchRoots_ ? - DirectoryModel.fakeDriveSpecialSearchEntries_ : []; + DirectoryModel.FAKE_DRIVE_SPECIAL_SEARCH_ENTRIES : []; } // Use a fake instead to return a list as fast as possible. groups.drive = [DirectoryModel.fakeDriveEntry_]; diff --git a/chrome/browser/resources/file_manager/js/sidebar.js b/chrome/browser/resources/file_manager/js/sidebar.js index 088f3ed..eee8cf3 100644 --- a/chrome/browser/resources/file_manager/js/sidebar.js +++ b/chrome/browser/resources/file_manager/js/sidebar.js @@ -148,9 +148,7 @@ DirectoryTreeUtil.addAndRemoveDriveSpecialDirs = function(entries) { } // Adds the special directories. - var specialDirs = [DirectoryModel.fakeDriveSharedWithMeEntry_, - DirectoryModel.fakeDriveRecentEntry_, - DirectoryModel.fakeDriveOfflineEntry_]; + var specialDirs = DirectoryModel.FAKE_DRIVE_SPECIAL_SEARCH_ENTRIES; for (var i in specialDirs) { var dir = specialDirs[i]; dir['label'] = PathUtil.getRootLabel(dir.fullPath); |