Skip to content

GitLab

T
tangled
Commit 6f300726 authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Commit Bot
Browse files
Options

Revert "Reland "Files app: Enable flag files-ng by default"" 

This reverts commit aed7a18a.

Reason for revert: Disabling for M-83, feature moved to M-84.

Original change's description:
> Reland "Files app: Enable flag files-ng by default"
> 
> This reverts commit 7545fd48.
> 
> Reason for revert: We want to enable the flag by default on ToT, the revert was intended to disable the flag on M-82, on ToT it should be
> enabled.
> 
> Original change's description:
> > Revert "Files app: Enable flag files-ng by default"
> > 
> > This reverts commit ea497580.
> > 
> > Reason for revert: Feature moved from M-82 to M-83.
> > 
> > Original change's description:
> > > Files app: Enable flag files-ng by default
> > >
> > > Add files-ng classes and attribute to main.html so files-ng styles are
> > > applied during app startup (to avoid a FOUC flash of non-files-ng blue
> > > color).
> > >
> > > Enable file-ng by default in FilesApp and its browser test harness.
> > >
> > > Bug: 992818
> > > Change-Id: If437271c5604d36b4b0908abb663a84e52b6ae35
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087308
> > > Reviewed-by: Alex Danilo <adanilo@chromium.org>
> > > Commit-Queue: Alex Danilo <adanilo@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#747421}
> > 
> > TBR=noel@chromium.org,lucmult@chromium.org,adanilo@chromium.org
> > 
> > Bug: 992818
> > Change-Id: I8b1c770e2c43823eff9a2a9aceae650fcb25a3f8
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103992
> > Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
> > Reviewed-by: Noel Gordon <noel@chromium.org>
> > Reviewed-by: Alex Danilo <adanilo@chromium.org>
> > Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#750448}
> 
> TBR=noel@chromium.org,lucmult@chromium.org,adanilo@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 992818
> Change-Id: I94e63a873d4e2970d201a32dca0944a4e8fa520f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2116152
> Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
> Reviewed-by: Noel Gordon <noel@chromium.org>
> Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#752674}

TBR=noel@chromium.org,lucmult@chromium.org,adanilo@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 992818
Change-Id: I3e6a3a82ded4953ea6c9757c0b94b500cd21563f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128045Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarAlex Danilo <adanilo@chromium.org>
Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754834}
parent d8113f43
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
View file @ 6f300726
...@@ -1559,7 +1559,7 @@ bool FileManagerBrowserTestBase::GetIsOffline() const { ...@@ -1559,7 +1559,7 @@ bool FileManagerBrowserTestBase::GetIsOffline() const {
} }
bool FileManagerBrowserTestBase::GetEnableFilesNg() const { bool FileManagerBrowserTestBase::GetEnableFilesNg() const {
return true; return false;
} }
bool FileManagerBrowserTestBase::GetEnableNativeSmb() const { bool FileManagerBrowserTestBase::GetEnableNativeSmb() const {
......
chromeos/constants/chromeos_features.cc
View file @ 6f300726
...@@ -157,7 +157,7 @@ const base::Feature kExoPointerLock{"ExoPointerLock", ...@@ -157,7 +157,7 @@ const base::Feature kExoPointerLock{"ExoPointerLock",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Enables the next generation file manager. // Enables the next generation file manager.
const base::Feature kFilesNG{"FilesNG", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kFilesNG{"FilesNG", base::FEATURE_DISABLED_BY_DEFAULT};
// Enables the use of Mojo by Chrome-process code to communicate with Power // Enables the use of Mojo by Chrome-process code to communicate with Power
// Manager. In order to use mojo, this feature must be turned on and a callsite // Manager. In order to use mojo, this feature must be turned on and a callsite
......
ui/file_manager/file_manager/main.html
View file @ 6f300726
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<script src="foreground/js/main_scripts.js" defer></script> <script src="foreground/js/main_scripts.js" defer></script>
</head> </head>
<body aria-label="$i18n{FILEMANAGER_APP_NAME}" tabindex="-1" class="files-ng"> <body aria-label="$i18n{FILEMANAGER_APP_NAME}" tabindex="-1">
<custom-style> <custom-style>
<style> <style>
.dialog-footer cr-input { .dialog-footer cr-input {
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
</cr-menu> </cr-menu>
</menus> </menus>
<div class="dialog-header files-ng" role="contentinfo"> <div class="dialog-header" role="contentinfo">
<div id="location-breadcrumbs" class="breadcrumbs"></div> <div id="location-breadcrumbs" class="breadcrumbs"></div>
<div id="read-only-indicator" hidden> <div id="read-only-indicator" hidden>
<span id="read-only-icon"></span> <span id="read-only-icon"></span>
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
<div class="dialog-container"> <div class="dialog-container">
<div class="dialog-navigation-list"> <div class="dialog-navigation-list">
<div class="dialog-navigation-list-contents" role="navigation"> <div class="dialog-navigation-list-contents" role="navigation">
<tree id="directory-tree" role="tree" tabindex="0" files-ng></tree> <tree id="directory-tree" role="tree" tabindex="0"></tree>
</div> </div>
<div class="dialog-navigation-list-footer" hidden> <div class="dialog-navigation-list-footer" hidden>
<div id="progress-center" hidden> <div id="progress-center" hidden>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment