From b0fc63172a4ee48edd90044b1d85ea84d72e7cf5 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Fri, 21 Jan 2011 03:54:37 +0000 Subject: Add Throbber control for DOMUI. Use it everywhere in options and in Sync setup UI. BUG=69755 TEST=Throbber works properly when settings page is scaled. Review URL: http://codereview.chromium.org/6378006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72104 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/dom_ui/shared_resources_data_source.cc | 2 ++ .../remoting/resources/remoting_setting_up.html | 21 +++-------------- .../options/clear_browser_data_overlay.html | 2 +- .../options/clear_browser_data_overlay.js | 14 ----------- .../resources/options/import_data_overlay.css | 4 ---- .../resources/options/import_data_overlay.html | 2 +- .../resources/options/import_data_overlay.js | 14 ----------- chrome/browser/resources/options/options.html | 1 + chrome/browser/resources/shared/css/throbber.css | 17 ++++++++++++++ chrome/browser/resources/shared_resources.grd | 2 ++ chrome/browser/sync/resources/gaia_login.html | 27 ++++++---------------- chrome/browser/sync/resources/setting_up.html | 21 +++-------------- 12 files changed, 37 insertions(+), 90 deletions(-) create mode 100644 chrome/browser/resources/shared/css/throbber.css (limited to 'chrome') diff --git a/chrome/browser/dom_ui/shared_resources_data_source.cc b/chrome/browser/dom_ui/shared_resources_data_source.cc index 063e05c..4922f1e 100644 --- a/chrome/browser/dom_ui/shared_resources_data_source.cc +++ b/chrome/browser/dom_ui/shared_resources_data_source.cc @@ -32,6 +32,8 @@ int PathToIDR(const std::string& path) { idr = IDR_FOLDER_OPEN; } else if (path == "app/resources/folder_open_rtl.png") { idr = IDR_FOLDER_OPEN_RTL; + } else if (path == "app/resources/throbber.png") { + idr = IDR_THROBBER; } else { // The name of the files in the grd list are prefixed with the following // directory: diff --git a/chrome/browser/remoting/resources/remoting_setting_up.html b/chrome/browser/remoting/resources/remoting_setting_up.html index 25c594e..c0a20a8 100644 --- a/chrome/browser/remoting/resources/remoting_setting_up.html +++ b/chrome/browser/remoting/resources/remoting_setting_up.html @@ -3,13 +3,8 @@ + -
- - - +
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index 30bf728..5e26c93 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html @@ -41,7 +41,7 @@
- +
- +
diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js index 0b7ebab..40e3804 100644 --- a/chrome/browser/resources/options/import_data_overlay.js +++ b/chrome/browser/resources/options/import_data_overlay.js @@ -18,8 +18,6 @@ cr.define('options', function() { 'import-data-overlay'); } - ImportDataOverlay.throbIntervalId = 0; - cr.addSingletonGetter(ImportDataOverlay); ImportDataOverlay.prototype = { @@ -168,18 +166,6 @@ cr.define('options', function() { $('import-browsers').disabled = state; $('import-data-commit').disabled = state; $('import-throbber').style.visibility = state ? "visible" : "hidden"; - - function advanceThrobber() { - var throbber = $('import-throbber'); - throbber.style.backgroundPositionX = - ((parseInt(getComputedStyle(throbber).backgroundPositionX, 10) - 16) - % 576) + 'px'; - } - if (state) { - ImportDataOverlay.throbIntervalId = setInterval(advanceThrobber, 30); - } else { - clearInterval(ImportDataOverlay.throbIntervalId); - } }; /** diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html index cd7f21d..9c7a195 100644 --- a/chrome/browser/resources/options/options.html +++ b/chrome/browser/resources/options/options.html @@ -9,6 +9,7 @@ + diff --git a/chrome/browser/resources/shared/css/throbber.css b/chrome/browser/resources/shared/css/throbber.css new file mode 100644 index 0000000..5c84e774 --- /dev/null +++ b/chrome/browser/resources/shared/css/throbber.css @@ -0,0 +1,17 @@ +.throbber { + -webkit-animation: throbber-animation 1s steps(36, end) 0 infinite; + background-image: url("../../../../../app/resources/throbber.png"); + background-position: 0; + display: inline-block; + height: 16px; + width: 16px; +} + +@-webkit-keyframes throbber-animation { + from { + background-position-x: 0; + } + to { + background-position-x: -576px; + } +} diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd index 0005019..0a34e5d 100644 --- a/chrome/browser/resources/shared_resources.grd +++ b/chrome/browser/resources/shared_resources.grd @@ -20,6 +20,8 @@ without changes to the corresponding grd file. paaaae --> file="shared/css/list.css" type="BINDATA" /> + + - +
+ -
- - - +
-- cgit v1.1