summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 22:18:48 +0000
committerbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 22:18:48 +0000
commit70b5ecaf5554037b5470b3ca64896eaa1b369063 (patch)
tree87022a9cc3fb5a22c049f37db410d45fe2b652b1 /chrome
parent56377c0323b23f86ae1498aceb43243010de79e1 (diff)
downloadchromium_src-70b5ecaf5554037b5470b3ca64896eaa1b369063.zip
chromium_src-70b5ecaf5554037b5470b3ca64896eaa1b369063.tar.gz
chromium_src-70b5ecaf5554037b5470b3ca64896eaa1b369063.tar.bz2
Hack: remove dangling chrome://theme/IDR_CLOSE_BAR* references
In issue 9187061 I stupidly overlooked some references to these moved assets (close box images). This change will cause them to appear again by replacing the chrome:// references with paths to the PNG images. These paths are turned into data references during the build process, which will add a few kilobytes to the executable size (the images are 125-227 bytes each). What should be done instead is to update the ThemeSource to find the assets in the new location. This is a temporary fix until that happens. BUG=110824,110828 TEST=none Review URL: http://codereview.chromium.org/9192037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/chromeos/login/user_pod_row.css6
-rw-r--r--chrome/browser/resources/ntp4/new_tab.css6
-rw-r--r--chrome/browser/resources/options/chromeos/accounts_options_page.css4
-rw-r--r--chrome/browser/resources/options2/chromeos/accounts_options_page.css4
-rw-r--r--chrome/browser/resources/shared/css/bubble.css8
-rw-r--r--chrome/browser/resources/shared/css/expandable_bubble.css8
6 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.css b/chrome/browser/resources/chromeos/login/user_pod_row.css
index e8ae362..c12f4ef2c 100644
--- a/chrome/browser/resources/chromeos/login/user_pod_row.css
+++ b/chrome/browser/resources/chromeos/login/user_pod_row.css
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
@@ -182,7 +182,7 @@ html[dir=rtl] .pod .capslock-hint {
.remove-user-button {
-webkit-transition: width 100ms ease-in-out, background 200ms ease-in-out;
-webkit-box-shadow: none;
- background: url('chrome://theme/IDR_CLOSE_BAR') center center no-repeat;
+ background: url('../../../../../ui/resources/close_bar.png') center center no-repeat;
border: 0;
height: 16px;
margin: 0;
@@ -196,7 +196,7 @@ html[dir=rtl] .pod .capslock-hint {
.remove-user-button:hover {
-webkit-box-shadow: none;
- background: url('chrome://theme/IDR_CLOSE_BAR_H') center center no-repeat;
+ background: url('../../../../../ui/resources/close_bar_h.png') center center no-repeat;
}
.remove-user-button.active {
diff --git a/chrome/browser/resources/ntp4/new_tab.css b/chrome/browser/resources/ntp4/new_tab.css
index 2f0d56d..6470457 100644
--- a/chrome/browser/resources/ntp4/new_tab.css
+++ b/chrome/browser/resources/ntp4/new_tab.css
@@ -66,7 +66,7 @@ body {
background: no-repeat;
background-color: transparent;
/* TODO(estade): this should animate between states. */
- background-image: url('chrome://theme/IDR_CLOSE_BAR');
+ background-image: url('../../../../ui/resources/close_bar.png');
border: 0;
cursor: default;
display: inline-block;
@@ -77,11 +77,11 @@ body {
.close-button:hover,
.close-button:focus {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_H');
+ background-image: url('../../../../ui/resources/close_bar_h.png');
}
.close-button:active {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_P');
+ background-image: url('../../../../ui/resources/close_bar_p.png');
}
.linkButton {
diff --git a/chrome/browser/resources/options/chromeos/accounts_options_page.css b/chrome/browser/resources/options/chromeos/accounts_options_page.css
index 1ba20e9..54a600b 100644
--- a/chrome/browser/resources/options/chromeos/accounts_options_page.css
+++ b/chrome/browser/resources/options/chromeos/accounts_options_page.css
@@ -38,13 +38,13 @@
}
.remove-user-button {
- background-image: url(chrome://theme/IDR_CLOSE_BAR);
+ background-image: url('../../../../../ui/resources/close_bar.png');
width: 16px;
height: 16px;
}
.remove-user-button:hover {
- background-image: url(chrome://theme/IDR_CLOSE_BAR_H);
+ background-image: url('../../../../../ui/resources/close_bar_h.png');
}
#userList {
diff --git a/chrome/browser/resources/options2/chromeos/accounts_options_page.css b/chrome/browser/resources/options2/chromeos/accounts_options_page.css
index 1ba20e9..54a600b 100644
--- a/chrome/browser/resources/options2/chromeos/accounts_options_page.css
+++ b/chrome/browser/resources/options2/chromeos/accounts_options_page.css
@@ -38,13 +38,13 @@
}
.remove-user-button {
- background-image: url(chrome://theme/IDR_CLOSE_BAR);
+ background-image: url('../../../../../ui/resources/close_bar.png');
width: 16px;
height: 16px;
}
.remove-user-button:hover {
- background-image: url(chrome://theme/IDR_CLOSE_BAR_H);
+ background-image: url('../../../../../ui/resources/close_bar_h.png');
}
#userList {
diff --git a/chrome/browser/resources/shared/css/bubble.css b/chrome/browser/resources/shared/css/bubble.css
index 114326d..54a60a7 100644
--- a/chrome/browser/resources/shared/css/bubble.css
+++ b/chrome/browser/resources/shared/css/bubble.css
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -38,15 +38,15 @@ html[dir='rtl'] .bubble-close {
}
.bubble-close {
- background-image: url('chrome://theme/IDR_CLOSE_BAR');
+ background-image: url('../../../../../ui/resources/close_bar.png');
}
.bubble-close:hover {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_H');
+ background-image: url('../../../../../ui/resources/close_bar_h.png');
}
.bubble-close:active {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_P');
+ background-image: url('../../../../../ui/resources/close_bar_p.png');
}
.bubble-shadow {
diff --git a/chrome/browser/resources/shared/css/expandable_bubble.css b/chrome/browser/resources/shared/css/expandable_bubble.css
index 193abe1..9de3b68 100644
--- a/chrome/browser/resources/shared/css/expandable_bubble.css
+++ b/chrome/browser/resources/shared/css/expandable_bubble.css
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -74,13 +74,13 @@
}
.expandable-bubble-close {
- background-image: url('chrome://theme/IDR_CLOSE_BAR');
+ background-image: url('../../../../../ui/resources/close_bar.png');
}
.expandable-bubble-close:hover {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_H');
+ background-image: url('../../../../../ui/resources/close_bar_h.png');
}
.expandable-bubble-close:active {
- background-image: url('chrome://theme/IDR_CLOSE_BAR_P');
+ background-image: url('../../../../../ui/resources/close_bar_p.png');
}