summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 23:16:58 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 23:16:58 +0000
commit75a3230a00c5416d5cbdd1f1803d126ab507b512 (patch)
treed55526ede53341a5cd30125676bf453e3cc713ab /chrome/browser/resources
parent9bea0a88d3c89b66cc95c9e7eae57b13f57ce3d6 (diff)
downloadchromium_src-75a3230a00c5416d5cbdd1f1803d126ab507b512.zip
chromium_src-75a3230a00c5416d5cbdd1f1803d126ab507b512.tar.gz
chromium_src-75a3230a00c5416d5cbdd1f1803d126ab507b512.tar.bz2
Lands http://codereview.chromium.org/505031 for dhg:
Browser should pop up status when usb is inserted. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/547009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/filebrowse.html22
1 files changed, 20 insertions, 2 deletions
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index bd9a31b..12f133c 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -116,7 +116,7 @@ li.filebrowserow span.name {
}
div.title {
- text-align: center;
+ text-align: right;
position: relative;
font-size: .8em;
font-weight: bold;
@@ -180,6 +180,14 @@ div.playbackcontainer {
background: black;
}
+div.scanningcontainer {
+ top: 0;
+ left: 0;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+}
+
div.container {
top: 50px;
position: absolute;
@@ -325,6 +333,14 @@ function getDataForPath(path) {
}
};
+function setUpForScanning() {
+ var header = $('header');
+ document.body.removeChild(header);
+ var main = $('main');
+ main.className = 'scanningcontainer';
+ main.textContent = 'Scanning Device...';
+};
+
///////////////////////////////////////////////////////////////////////////////
// Document Functions:
/**
@@ -334,7 +350,9 @@ function load() {
if (document.location.href.indexOf('#') != -1) {
var currentpathArray = document.location.href.split('#');
var path = currentpathArray[1];
- if (pathIsVideoFile(path) || pathIsAudioFile(path)) {
+ if (path == 'scanningdevice') {
+ setUpForScanning();
+ } else if (pathIsVideoFile(path) || pathIsAudioFile(path)) {
setUpForPlayback(path);
} else {
pathArray.push(path);