summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/resources
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 17:53:05 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 17:53:05 +0000
commit64268ce6b86e7f46dba3313c93e823e544528666 (patch)
tree96e61ee1f91a3f8f33fa1c9d180ed16ea6ecc726 /chrome/browser/sync/resources
parent15eaf50cd1ee763193d8cbe33e5f0d823d295d12 (diff)
downloadchromium_src-64268ce6b86e7f46dba3313c93e823e544528666.zip
chromium_src-64268ce6b86e7f46dba3313c93e823e544528666.tar.gz
chromium_src-64268ce6b86e7f46dba3313c93e823e544528666.tar.bz2
Fix missing throbber in sync dialogs. This actually does a number of things:
* Correct throbber path in choose_datatypes.html (I overlooked this) * Change CSS style settings for throbber to a form the inliner could understand, so the image got inlined properly * Remove references to throbber path from sync_setup_wizard.cc (no longer needed) * Fix improper use of url_constants.* (only paths that need to be in common/ should be there) and change sync hostname constant name to match other hostnames' naming scheme BUG=40984 TEST=Signing into GAIA in sync setup dialog should show a throbber Review URL: http://codereview.chromium.org/2840035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/resources')
-rw-r--r--chrome/browser/sync/resources/choose_datatypes.html12
-rw-r--r--chrome/browser/sync/resources/gaia_login.html11
2 files changed, 17 insertions, 6 deletions
diff --git a/chrome/browser/sync/resources/choose_datatypes.html b/chrome/browser/sync/resources/choose_datatypes.html
index 6b40492..bc01f5e 100644
--- a/chrome/browser/sync/resources/choose_datatypes.html
+++ b/chrome/browser/sync/resources/choose_datatypes.html
@@ -42,6 +42,14 @@ table {
.data_type_checkboxes_table td {
padding: 5px;
}
+#throb {
+ background-image: url("../../../../app/resources/throbber.png");
+ width: 16px;
+ height: 16px;
+ background-position: 0px;
+ margin: -3px 10px;
+ display: inline-block;
+}
input[type='button'] {
min-width: 87px;
min-height: 26px;
@@ -260,9 +268,7 @@ input[type='submit'] {
<tr valign="bottom">
<td width="100%" class="endaligned">
<span id="throbber_container" style="visibility:hidden">
- <span id="throb" style="background-image:url(throbber.png);
- width:16px; height:16px; background-position:0px; margin:-3px 10px;
- display:inline-block">
+ <span id="throb">
</span>
</span>
<input id="okButton" type="submit" i18n-values="value:ok" />
diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html
index 9f55bd1..6ada2a5 100644
--- a/chrome/browser/sync/resources/gaia_login.html
+++ b/chrome/browser/sync/resources/gaia_login.html
@@ -52,6 +52,13 @@
width: 200px;
height: 70px;
}
+ #throb {
+ background-image: url("../../../../app/resources/throbber.png");
+ width: 16px;
+ height: 16px;
+ background-position: 0px;
+ margin: 0px 10px 0px 10px"
+ }
.toppageverticalspace {
height: 15px;
}
@@ -438,9 +445,7 @@
<tr>
<td>
<div id="throbber_container" style="display:none;">
- <div id="throb" style="background-image:url(../../../../app/resources/throbber.png);
- width:16px; height:16px; background-position:0px;
- margin:0px 10px 0px 10px">
+ <div id="throb">
</div>
</div>
</td>