summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc6
-rw-r--r--chrome/browser/dom_ui/most_visited_handler.cc8
-rw-r--r--chrome/browser/resources/downloads.html2
-rw-r--r--chrome/browser/resources/new_incognito_tab_theme.css2
-rw-r--r--chrome/browser/resources/new_new_tab.css14
-rw-r--r--chrome/browser/resources/new_new_tab.js2
-rw-r--r--chrome/browser/resources/new_tab_theme.css6
-rw-r--r--chrome/browser/resources/ntp/apps.css9
-rw-r--r--chrome/browser/resources/ntp/most_visited.css18
-rw-r--r--chrome/browser/resources_util_unittest.cc8
10 files changed, 37 insertions, 38 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
index d7a6336..c093e1e 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -66,12 +66,12 @@ TEST_F(DOMUISourcesTest, ThemeSourceMimeTypes) {
TEST_F(DOMUISourcesTest, ThemeSourceImages) {
// We used to PNGEncode the images ourselves, but encoder differences
// invalidated that. We now just check that the image exists.
- theme_source()->StartDataRequest("theme_frame_incognito", true, 1);
+ theme_source()->StartDataRequest("IDR_THEME_FRAME_INCOGNITO", true, 1);
size_t min = 0;
EXPECT_EQ(theme_source()->result_request_id_, 1);
EXPECT_GT(theme_source()->result_data_size_, min);
- theme_source()->StartDataRequest("theme_toolbar", true, 2);
+ theme_source()->StartDataRequest("IDR_THEME_TOOLBAR", true, 2);
EXPECT_EQ(theme_source()->result_request_id_, 2);
EXPECT_GT(theme_source()->result_data_size_, min);
}
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index c7d38cf..a4e5e74 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.cc
@@ -453,15 +453,15 @@ const std::vector<MostVisitedHandler::MostVisitedPage>&
MostVisitedPage welcome_page = {
l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
- GURL("chrome://theme/newtab_chrome_welcome_page_thumbnail"),
- GURL("chrome://theme/newtab_chrome_welcome_page_favicon")};
+ GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL"),
+ GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON")};
pages.push_back(welcome_page);
MostVisitedPage gallery_page = {
l10n_util::GetString(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE),
GURL(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL))),
- GURL("chrome://theme/newtab_themes_gallery_thumbnail"),
- GURL("chrome://theme/newtab_themes_gallery_favicon")};
+ GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL"),
+ GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON")};
pages.push_back(gallery_page);
}
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index 449fb19..0cfbae5 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -108,7 +108,7 @@ html[dir=rtl] .icon {
.download.otr > .safe,
.download.otr > .show-dangerous {
- background: url(chrome://theme/otr_icon_standalone) no-repeat 100% 100%;
+ background: url(chrome://theme/IDR_OTR_ICON_STANDALONE) no-repeat 100% 100%;
opacity: .66;
-webkit-transition: opacity .15s;
}
diff --git a/chrome/browser/resources/new_incognito_tab_theme.css b/chrome/browser/resources/new_incognito_tab_theme.css
index d960795..64af626 100644
--- a/chrome/browser/resources/new_incognito_tab_theme.css
+++ b/chrome/browser/resources/new_incognito_tab_theme.css
@@ -1,5 +1,5 @@
html {
- background-image: url(chrome://theme/theme_ntp_background?$1);
+ background-image: url(chrome://theme/IDR_THEME_NTP_BACKGROUND?$1);
background-color: $2;
background-position: $3;
background-repeat: $5;
diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_new_tab.css
index d56a7d5..e7534b8 100644
--- a/chrome/browser/resources/new_new_tab.css
+++ b/chrome/browser/resources/new_new_tab.css
@@ -18,7 +18,7 @@ html[mode=app-launcher] {
#main {
-webkit-box-sizing: border-box;
-webkit-transition: width .15s;
- background: url(chrome://theme/product_logo) no-repeat 0 6px;
+ background: url(chrome://theme/IDR_PRODUCT_LOGO) no-repeat 0 6px;
margin: 0 auto;
min-height: 100%;
padding-bottom: 25px; /* Make room for the bottom positioned footer. */
@@ -156,7 +156,7 @@ html[dir=rtl] .item {
on :hover. To get this to work we have to set visibility
to visible which unfortunately breaks the ellipsis for t
he window items */
- background-image: url(chrome://theme/newtab_closed_window);
+ background-image: url(chrome://theme/IDR_NEWTAB_CLOSED_WINDOW);
}
.window-menu {
@@ -295,17 +295,17 @@ html[dir=rtl] .item {
-webkit-margin-start: 10px;
/* Do not show focus outline */
outline: none;
- background-image: url(chrome://theme/newtab_option);
+ background-image: url(chrome://theme/IDR_NEWTAB_OPTION);
}
#option-button:hover,
#option-button:focus {
- background-image: url(chrome://theme/newtab_option_h);
+ background-image: url(chrome://theme/IDR_NEWTAB_OPTION_H);
}
#option-button:active,
#option-button.open {
- background-image: url(chrome://theme/newtab_option_p);
+ background-image: url(chrome://theme/IDR_NEWTAB_OPTION_P);
}
#option-menu {
@@ -340,11 +340,11 @@ html[dir=rtl] #option-menu > [command=hide]:before {
}
#option-menu > [command=hide]:before {
- background-image: url(chrome://theme/newtab_checkbox_black);
+ background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_BLACK);
}
#option-menu > [selected][command=hide]:active:before {
- background-image: url(chrome://theme/newtab_checkbox_white);
+ background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_WHITE);
}
#attribution {
diff --git a/chrome/browser/resources/new_new_tab.js b/chrome/browser/resources/new_new_tab.js
index 16549d2..5728d58 100644
--- a/chrome/browser/resources/new_new_tab.js
+++ b/chrome/browser/resources/new_new_tab.js
@@ -322,7 +322,7 @@ function themeChanged() {
}
function updateAttribution() {
- $('attribution-img').src = 'chrome://theme/theme_ntp_attribution?' +
+ $('attribution-img').src = 'chrome://theme/IDR_THEME_NTP_ATTRIBUTION?' +
Date.now();
}
diff --git a/chrome/browser/resources/new_tab_theme.css b/chrome/browser/resources/new_tab_theme.css
index 031e524..ae39264 100644
--- a/chrome/browser/resources/new_tab_theme.css
+++ b/chrome/browser/resources/new_tab_theme.css
@@ -1,5 +1,5 @@
html {
- background-image: url(chrome://theme/theme_ntp_background?$1);
+ background-image: url(chrome://theme/IDR_THEME_NTP_BACKGROUND?$1);
background-color: $2; /* COLOR_NTP_BACKGROUND */
background-position: $3;
background-repeat: $5;
@@ -17,7 +17,7 @@ body {
}
#main {
- background: url(chrome://theme/product_logo?$1) no-repeat 0 8px;
+ background: url(chrome://theme/IDR_PRODUCT_LOGO?$1) no-repeat 0 8px;
}
#notification.first-run {
@@ -70,7 +70,7 @@ body {
#option-button {
background-color: $7; /* color_header_gradient_light */
- -webkit-mask-image: url(chrome://theme/newtab_menu_mask);
+ -webkit-mask-image: url(chrome://theme/IDR_NEWTAB_MENU_MASK);
}
#recently-closed {
diff --git a/chrome/browser/resources/ntp/apps.css b/chrome/browser/resources/ntp/apps.css
index f54cd93..73a13b8 100644
--- a/chrome/browser/resources/ntp/apps.css
+++ b/chrome/browser/resources/ntp/apps.css
@@ -58,13 +58,13 @@
.app > .front > .flip {
-webkit-transition: opacity .3s;
-webkit-transition-delay: 0;
- background-image: url(chrome://theme/balloon_wrench);
+ background-image: url(chrome://theme/IDR_BALLOON_WRENCH);
opacity: 0;
}
.app > .front > .flip:hover {
-webkit-transition: none;
- background-image: url(chrome://theme/balloon_wrench_hover);
+ background-image: url(chrome://theme/IDR_BALLOON_WRENCH_HOVER);
}
.app:hover > .front > .flip,
@@ -74,12 +74,12 @@
}
.app > .back > .flip {
- background-image: url(chrome://theme/balloon_close);
+ background-image: url(chrome://theme/IDR_BALLOON_CLOSE);
opacity: .9;
}
.app > .back > .flip:hover {
- background-image: url(chrome://theme/balloon_close_hover);
+ background-image: url(chrome://theme/IDR_BALLOON_CLOSE_HOVER);
}
.app > .back {
@@ -151,4 +151,3 @@ html[has_3d=false] .app > .back {
html[has_3d=false] .app.config > .back {
display: block;
}
-
diff --git a/chrome/browser/resources/ntp/most_visited.css b/chrome/browser/resources/ntp/most_visited.css
index 464506d..5d1dff83 100644
--- a/chrome/browser/resources/ntp/most_visited.css
+++ b/chrome/browser/resources/ntp/most_visited.css
@@ -120,39 +120,39 @@
}
.edit-bar > .pin {
- background-image: url(chrome://theme/newtab_pin_off);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF);
}
.edit-bar > .pin:hover {
- background-image: url(chrome://theme/newtab_pin_off_h);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_H);
}
.edit-bar > .pin:active {
- background-image: url(chrome://theme/newtab_pin_off_p);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_P);
}
.pinned .edit-bar > .pin {
- background-image: url(chrome://theme/newtab_pin_on);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON);
}
.pinned .edit-bar > .pin:hover {
- background-image: url(chrome://theme/newtab_pin_on_h);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_H);
}
.pinned .edit-bar > .pin:active {
- background-image: url(chrome://theme/newtab_pin_on_p);
+ background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_P);
}
.edit-bar > .remove {
- background-image: url(chrome://theme/newtab_close);
+ background-image: url(chrome://theme/IDR_NEWTAB_CLOSE);
}
.edit-bar > .remove:hover {
- background-image: url(chrome://theme/newtab_close_h);
+ background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_H);
}
.edit-bar > .remove:active {
- background-image: url(chrome://theme/newtab_close_p);
+ background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_P);
}
.thumbnail-container > .title > div {
diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc
index caa21ba..51651da 100644
--- a/chrome/browser/resources_util_unittest.cc
+++ b/chrome/browser/resources_util_unittest.cc
@@ -18,10 +18,10 @@ struct TestCase {
TEST(ResourcesUtil, SpotCheckIds) {
const TestCase kTestCases[] = {
- {"back", IDR_BACK},
- {"stop", IDR_STOP},
- {"omnibox_star", IDR_OMNIBOX_STAR},
- {"sad_tab", IDR_SAD_TAB},
+ {"IDR_BACK", IDR_BACK},
+ {"IDR_STOP", IDR_STOP},
+ {"IDR_OMNIBOX_STAR", IDR_OMNIBOX_STAR},
+ {"IDR_SAD_TAB", IDR_SAD_TAB},
};
for (size_t i = 0; i < arraysize(kTestCases); ++i) {
EXPECT_EQ(kTestCases[i].id,
generated by cgit v1.1 at 2025-01-09 10:06:23 +0000