Skip to content

GitLab

T
tangled
Commit 1f93da45 authored by asanka@chromium.org's avatar asanka@chromium.org
Browse files
Options

Remove Active Downloads UI. 

This is no longer in use since ChromeOS is now always building USE_AURA.

BUG=none
TEST=compiles


Review URL: http://codereview.chromium.org/10073017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133540 0039d316-1c4b-4281-b951-d872f2087c98
parent 51226545
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 899 deletions
WATCHLISTS
View file @ 1f93da45
......@@ -243,9 +243,6 @@
'imageburner': {
'filepath': 'imageburner'
},
'active_downloads': {
'filepath': 'active_downloads'
},
'gdata' : {
'filepath': 'gdata'
},
......@@ -425,7 +422,6 @@
'chromedriver': ['kkania@chromium.org'],
'task_manager': ['yoshiki+watch@chromium.org'],
'imageburner': ['achuith+watch@chromium.org', 'tbarzic+watch@chromium.org'],
'active_downloads': ['achuith+watch@chromium.org'],
'filebrowse': ['rginda+watch@chromium.org'],
'gdata': ['achuith+watch@chromium.org'],
'clang_update': ['fischman+watch@chromium.org', 'ukai+watch@chromium.org',
......
chrome/browser/browser_about_handler.cc
View file @ 1f93da45
......@@ -71,7 +71,6 @@ const char* const kChromePaths[] = {
chrome::kChromeUISandboxHost,
#endif
#if defined(OS_CHROMEOS)
chrome::kChromeUIActiveDownloadsHost,
chrome::kChromeUIChooseMobileNetworkHost,
chrome::kChromeUICryptohomeHost,
chrome::kChromeUIDiscardsHost,
......
chrome/browser/browser_resources.grd
View file @ 1f93da45
......@@ -145,8 +145,6 @@
</if>
<if expr="pp_ifdef('chromeos')">
<include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\chromeos\active_downloads.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_ACTIVE_DOWNLOADS_JS" file="resources\chromeos\active_downloads.js" type="BINDATA" />
<include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\choose_mobile_network.js" type="BINDATA" />
<include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\crosh_builtin\manifest.json" type="BINDATA" />
......
chrome/browser/download/save_page_browsertest.cc
View file @ 1f93da45
......@@ -97,10 +97,6 @@ class SavePageBrowserTest : public InProcessBrowserTest {
GetOriginalUrl();
}
void CheckDownloadUI(const FilePath& download_path) const {
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
}
DownloadManager* GetDownloadManager() const {
DownloadManager* download_manager =
DownloadServiceFactory::GetForProfile(
......@@ -185,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnly) {
EXPECT_EQ(url, WaitForSavePackageToFinish());
CheckDownloadUI(full_file_name);
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
CheckDownloadHistory(url, full_file_name, 1); // a.htm is 1 file.
EXPECT_TRUE(file_util::PathExists(full_file_name));
......@@ -210,7 +206,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveViewSourceHTMLOnly) {
EXPECT_EQ(actual_page_url, WaitForSavePackageToFinish());
CheckDownloadUI(full_file_name);
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
CheckDownloadHistory(actual_page_url, full_file_name, 1); // a.htm is 1 file.
EXPECT_TRUE(file_util::PathExists(full_file_name));
......@@ -230,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveCompleteHTML) {
EXPECT_EQ(url, WaitForSavePackageToFinish());
CheckDownloadUI(full_file_name);
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
CheckDownloadHistory(url, full_file_name, 3); // b.htm is 3 files.
EXPECT_TRUE(file_util::PathExists(full_file_name));
......@@ -264,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FileNameFromPageTitle) {
EXPECT_EQ(url, WaitForSavePackageToFinish());
CheckDownloadUI(full_file_name);
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
CheckDownloadHistory(url, full_file_name, 3); // b.htm is 3 files.
EXPECT_TRUE(file_util::PathExists(full_file_name));
......@@ -290,7 +286,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, RemoveFromList) {
EXPECT_EQ(url, WaitForSavePackageToFinish());
CheckDownloadUI(full_file_name);
EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
CheckDownloadHistory(url, full_file_name, 1); // a.htm is 1 file.
EXPECT_EQ(GetDownloadManager()->RemoveAllDownloads(), 1);
......
chrome/browser/resources/chromeos/active_downloads.html deleted 100644 → 0
View file @ 51226545
<!DOCTYPE HTML>
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
<title i18n-content="title"></title>
<link rel="icon" href="../../../app/theme/downloads_favicon.png">
<style type="text/css">
*:-khtml-drag {
background-color: rgba(238,238,238, 0.5);
}
*[draggable] {
-khtml-user-drag: element;
cursor: move;
}
ul.downloadlist {
list-style-type: none;
margin: 0;
padding: 0;
position: relative;
}
.menuicon {
margin: 20px auto auto auto;
height: 4px;
width: 5px;
background: url('../shared/images/active_downloads_menu.png') no-repeat;
}
.menubutton {
float: right;
height: 43px;
width: 24px;
border-left: 1px solid #CCC;
border-bottom: 1px solid #CCC;
cursor: pointer;
}
/* TODO(achuith): fix rtl */
html[dir=rtl] .menubutton {
float: left;
}
.rowbg {
border-bottom: 1px solid #CCC;
background: -webkit-gradient(linear, left top, left bottom,
from(#f3f3f3), to(#ebebeb), color-stop(0.8, #ededed));
}
.rowbg:hover {
background: -webkit-gradient(linear, left top, left bottom,
from(#fdfdfd), to(#f1f1f1), color-stop(0.8, #f5f5f5));
}
.rowbg:active {
background: -webkit-gradient(linear, left top, left bottom,
from(#d2e0f0), to(#dee6f0), color-stop(0.1, #e3e9f0));
}
.downloadrow {
height: 36px;
}
.rowbutton {
padding: 5px 5px 0 7px;
position: relative;
width:213px;
height: 30px;
}
.rowbutton div.icon {
float: left;
margin-top: 1px;
width: 21px;
height: 17px;
background-repeat: no-repeat;
}
.rowbutton div.iconwarning {
float: left;
margin-top: 1px;
width: 37px;
height: 30px;
background: url('../shared/images/icon_warning2.png') no-repeat;
}
.rowbutton span.title {
position: relative;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
overflow: hidden;
width: 191px;
margin-right: -20px;
color: #325282;
font-size: .8em;
}
.dangerousprompt {
margin: 0 5px 5px 3px;
display: block;
}
.dangerousprompttext {
font-size: .7em;
color: #325282;
}
.confirm {
font-size: .6em;
text-decoration: underline;
margin-left: 5px;
color: #254f9b;
cursor: pointer;
}
.progress {
font-size: .7em;
text-align: right;
color: #325282;
margin-top: 2px;
}
div.columnlist {
width: 100%;
top: 0;
left: 0;
bottom: 29px;
position: absolute;
background: #e8e8e8
}
span.showallfilestext {
color: #254f9b;
cursor: pointer;
text-decoration: underline;
font-size: 12px;
height: 15px;
}
div.showallfiles {
width: 100%;
bottom: 0;
height: 29px;
position: absolute;
margin-left: -8px;
text-align: center;
background: #e8e8e8
}
.menu {
margin-top: 5px;
right: 15px;
border-bottom-left-radius: 4px 4px;
border-bottom-right-radius: 4px 4px;
border-top-left-radius: 4px 4px;
border-top-right-radius: 0px 0px;
position: absolute;
display: none;
z-index: 999;
background: -webkit-gradient(linear, left top, left bottom,
from(#f3f3f3), to(#ebebeb), color-stop(0.8, #ededed));
border: 1px solid rgba(0, 0, 0, 0.6);
padding: 2px 5px 0 5px;
}
.menuitem {
width: 100%;
height: 20px;
font-size: .8em;
text-align: left;
cursor: pointer;
left: 0;
color: #0D0052;
-webkit-transition: color 1s ease-out ;
}
.menuitem:hover {
text-decoration: underline;
color: #20c;
background: #ebeff9;
-webkit-transition: color 0 ease-out ;
}
</style>
<script src="chrome://resources/js/local_strings.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://active-downloads/strings.js"></script>
<script src="chrome://active-downloads/active_downloads.js"></script>
<body i18n-values=".style.fontFamily:fontfamily">
<div id="main" class="columnlist"></div>
<div id="showallfiles" class="showallfiles">
<span id="showallfilestext" class="showallfilestext"></span>
</div>
<script src="chrome://resources/js/i18n_template.js"></script>
<script src="chrome://resources/js/i18n_process.js"></script>
</body>
</html>
chrome/browser/resources/chromeos/active_downloads.js deleted 100644 → 0
View file @ 51226545
This diff is collapsed.
chrome/common/url_constants.cc
View file @ 1f93da45
......@@ -70,7 +70,6 @@ const char kChromeUIVersionURL[] = "chrome://version/";
#if defined(OS_CHROMEOS)
const char kChromeUIActivationMessage[] = "chrome://activationmessage/";
const char kChromeUIActiveDownloadsURL[] = "chrome://active-downloads/";
const char kChromeUIChooseMobileNetworkURL[] =
"chrome://choose-mobile-network/";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
......@@ -194,7 +193,6 @@ const char kChromeUISandboxHost[] = "sandbox";
#if defined(OS_CHROMEOS)
const char kChromeUIActivationMessageHost[] = "activationmessage";
const char kChromeUIActiveDownloadsHost[] = "active-downloads";
const char kChromeUIChooseMobileNetworkHost[] = "choose-mobile-network";
const char kChromeUICryptohomeHost[] = "cryptohome";
const char kChromeUIDiscardsHost[] = "discards";
......
chrome/common/url_constants.h
View file @ 1f93da45
......@@ -70,7 +70,6 @@ extern const char kChromeUIVersionURL[];
#if defined(OS_CHROMEOS)
extern const char kChromeUIActivationMessage[];
extern const char kChromeUIActiveDownloadsURL[];
extern const char kChromeUIChooseMobileNetworkURL[];
extern const char kChromeUIDiscardsURL[];
extern const char kChromeUIIdleLogoutDialogURL[];
......@@ -191,7 +190,6 @@ extern const char kChromeUISandboxHost[];
#if defined(OS_CHROMEOS)
extern const char kChromeUIActivationMessageHost[];
extern const char kChromeUIActiveDownloadsHost[];
extern const char kChromeUIChooseMobileNetworkHost[];
extern const char kChromeUICryptohomeHost[];
extern const char kChromeUIDiscardsHost[];
......
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