summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-29 23:30:20 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-29 23:30:20 +0000
commit7e90c1aebfadd9aa71a3dda8909ba3c62c140138 (patch)
tree0ef20bfe491694f75ee17c4d822a23448ca15198
parent4672c6c2168c34722d5dc9dd09d864dc4d77d77d (diff)
downloadchromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.zip
chromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.tar.gz
chromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.tar.bz2
rename chrome_shared2.css to chrome_shared.css
BUG=103688 TEST=none Review URL: https://chromiumcodereview.appspot.com/10444043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/browser/resources/certificate_viewer.html2
-rw-r--r--chrome/browser/resources/chromeos/proxy_settings.html2
-rw-r--r--chrome/browser/resources/downloads/downloads.html5
-rw-r--r--chrome/browser/resources/extensions/extension_activity.html2
-rw-r--r--chrome/browser/resources/extensions/extensions.html2
-rw-r--r--chrome/browser/resources/feedback.html2
-rw-r--r--chrome/browser/resources/help/help.html2
-rw-r--r--chrome/browser/resources/history/history.html2
-rw-r--r--chrome/browser/resources/options2/options.html2
-rw-r--r--chrome/browser/resources/print_preview/print_preview.html3
-rw-r--r--chrome/browser/resources/shared/css/chrome_shared.css (renamed from chrome/browser/resources/shared/css/chrome_shared2.css)3
-rw-r--r--chrome/browser/resources/shared/css/chrome_shared_touch.css (renamed from chrome/browser/resources/shared/css/chrome_shared2_touch.css)4
-rw-r--r--chrome/browser/resources/shared_resources.grd8
-rw-r--r--chrome/browser/resources/task_manager/includes.js3
-rw-r--r--chrome/browser/resources/uber/uber.html2
-rw-r--r--chrome/browser/resources/uber/uber_frame.html2
-rw-r--r--chrome/browser/ui/webui/shared_resources_data_source.cc4
17 files changed, 23 insertions, 27 deletions
diff --git a/chrome/browser/resources/certificate_viewer.html b/chrome/browser/resources/certificate_viewer.html
index b858574..49fa32c 100644
--- a/chrome/browser/resources/certificate_viewer.html
+++ b/chrome/browser/resources/certificate_viewer.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title id="title"></title>
- <link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+ <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/tabs.css">
<link rel="stylesheet" href="chrome://resources/css/tree.css">
<link rel="stylesheet" href="certificate_viewer.css">
diff --git a/chrome/browser/resources/chromeos/proxy_settings.html b/chrome/browser/resources/chromeos/proxy_settings.html
index 485b2ea..3194ca6 100644
--- a/chrome/browser/resources/chromeos/proxy_settings.html
+++ b/chrome/browser/resources/chromeos/proxy_settings.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html i18n-values="dir:textdirection">
<head>
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html
index 1891426..bd9b3d7 100644
--- a/chrome/browser/resources/downloads/downloads.html
+++ b/chrome/browser/resources/downloads/downloads.html
@@ -4,10 +4,9 @@
<meta charset="utf-8">
<title i18n-content="title"></title>
<link rel="icon" href="chrome://theme/IDR_DOWNLOADS_FAVICON">
- <link rel="stylesheet" href="../shared/css/chrome_shared2.css">
- <!-- This has to come after chrome_shared2.css -->
+ <link rel="stylesheet" href="../shared/css/chrome_shared.css">
+ <!-- This has to come after chrome_shared.css -->
<link rel="stylesheet" href="../old_webui.css">
- <link rel="stylesheet" href="../shared/css/widgets.css">
<link rel="stylesheet" href="downloads.css">
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
diff --git a/chrome/browser/resources/extensions/extension_activity.html b/chrome/browser/resources/extensions/extension_activity.html
index 7ccbc76..1546952 100644
--- a/chrome/browser/resources/extensions/extension_activity.html
+++ b/chrome/browser/resources/extensions/extension_activity.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" href="extensions.css">
<link rel="stylesheet" href="extension_activity.css">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/i18n_template.js"></script>
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html
index d7a824f..9669808 100644
--- a/chrome/browser/resources/extensions/extensions.html
+++ b/chrome/browser/resources/extensions/extensions.html
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="extensions.css">
<link rel="stylesheet" href="pack_extension_overlay.css">
<link rel="stylesheet" href="chrome://resources/css/alert_overlay.css">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/overlay.css">
<link rel="stylesheet" href="chrome://resources/css/trash.css">
<link rel="stylesheet" href="../uber/uber_shared.css">
diff --git a/chrome/browser/resources/feedback.html b/chrome/browser/resources/feedback.html
index e39e7fe..fb949f8 100644
--- a/chrome/browser/resources/feedback.html
+++ b/chrome/browser/resources/feedback.html
@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<title i18n-content="page-title"></title>
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="feedback.css">
<script src="chrome://resources/js/load_time_data.js"></script>
diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html
index ab4dfa1..d4e3162 100644
--- a/chrome/browser/resources/help/help.html
+++ b/chrome/browser/resources/help/help.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title i18n-content="helpTitle"></title>
- <link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+ <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="../uber/uber_shared.css">
<link rel="stylesheet" href="help.css">
<script src="chrome://resources/js/cr.js"></script>
diff --git a/chrome/browser/resources/history/history.html b/chrome/browser/resources/history/history.html
index d3b5847..e8faeb0 100644
--- a/chrome/browser/resources/history/history.html
+++ b/chrome/browser/resources/history/history.html
@@ -5,7 +5,7 @@
<title i18n-content="title"></title>
<link rel="icon" href="chrome://theme/IDR_HISTORY_FAVICON">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css">
<link rel="stylesheet" href="chrome://resources/css/menu_button.css">
<link rel="stylesheet" href="../uber/uber_shared.css">
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 143f568..1c70554 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title i18n-content="optionsPageTitle"></title>
<link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/overlay.css">
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
diff --git a/chrome/browser/resources/print_preview/print_preview.html b/chrome/browser/resources/print_preview/print_preview.html
index 58bfce5..c3fd255 100644
--- a/chrome/browser/resources/print_preview/print_preview.html
+++ b/chrome/browser/resources/print_preview/print_preview.html
@@ -7,9 +7,8 @@
<link rel="icon" href="../../../app/theme/print_preview_favicon.png">
<link rel="stylesheet" href="print_preview.css"/>
- <link rel="stylesheet" href="../shared/css/chrome_shared2.css"/>
+ <link rel="stylesheet" href="../shared/css/chrome_shared.css"/>
<link rel="stylesheet" href="../shared/css/throbber.css"/>
- <link rel="stylesheet" href="../shared/css/widgets.css"/>
<link rel="stylesheet" href="print_header.css"/>
<link rel="stylesheet" href="settings/copies_settings.css"/>
<link rel="stylesheet" href="settings/page_settings.css"/>
diff --git a/chrome/browser/resources/shared/css/chrome_shared2.css b/chrome/browser/resources/shared/css/chrome_shared.css
index 23b18b9..134e3dc 100644
--- a/chrome/browser/resources/shared/css/chrome_shared2.css
+++ b/chrome/browser/resources/shared/css/chrome_shared.css
@@ -3,8 +3,7 @@
* found in the LICENSE file. */
/* This file holds CSS that should be shared, in theory, by all user-visible
- * chrome:// pages. This contrasts chrome_shared.css, which it is meant to
- * replace, but has CSS specific to options and options-like pages. */
+ * chrome:// pages. */
@import url("chrome://resources/css/widgets.css");
<if expr="pp_ifdef('chromeos')">
diff --git a/chrome/browser/resources/shared/css/chrome_shared2_touch.css b/chrome/browser/resources/shared/css/chrome_shared_touch.css
index cd9207f..50f5412 100644
--- a/chrome/browser/resources/shared/css/chrome_shared2_touch.css
+++ b/chrome/browser/resources/shared/css/chrome_shared_touch.css
@@ -2,11 +2,11 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
-/* NB: do not include this file directly. Include chrome_shared2.css. If touch
+/* NB: do not include this file directly. Include chrome_shared.css. If touch
* optimization is enabled, these rules will be automatically loaded by the
* SharedResourceDataSource. */
-<include src="chrome_shared2.css">
+<include src="chrome_shared.css">
input[type='input'],
input[type='password'],
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 9032c9d..32fbff4 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -26,11 +26,11 @@ without changes to the corresponding grd file. -->
<include name="IDR_SHARED_CSS_MENU_BUTTON"
file="shared/css/menu_button.css" type="BINDATA"
flattenhtml="true" />
- <include name="IDR_SHARED_CSS_CHROME2"
- file="shared/css/chrome_shared2.css" type="BINDATA"
+ <include name="IDR_SHARED_CSS_CHROME"
+ file="shared/css/chrome_shared.css" type="BINDATA"
flattenhtml="true" />
- <include name="IDR_SHARED_CSS_CHROME2_TOUCH"
- file="shared/css/chrome_shared2_touch.css" type="BINDATA"
+ <include name="IDR_SHARED_CSS_CHROME_TOUCH"
+ file="shared/css/chrome_shared_touch.css" type="BINDATA"
flattenhtml="true" />
<include name="IDR_SHARED_CSS_OVERLAY"
file="shared/css/overlay.css" type="BINDATA"
diff --git a/chrome/browser/resources/task_manager/includes.js b/chrome/browser/resources/task_manager/includes.js
index 76cb8ebe..0a676ef 100644
--- a/chrome/browser/resources/task_manager/includes.js
+++ b/chrome/browser/resources/task_manager/includes.js
@@ -7,11 +7,10 @@
// reference the resources.
var css = [
- 'chrome_shared2.css',
+ 'chrome_shared.css',
'list.css',
'table.css',
'menu.css',
- 'widgets.css',
];
var script = [
diff --git a/chrome/browser/resources/uber/uber.html b/chrome/browser/resources/uber/uber.html
index d711fab..7fb9dbd 100644
--- a/chrome/browser/resources/uber/uber.html
+++ b/chrome/browser/resources/uber/uber.html
@@ -5,7 +5,7 @@
<title i18n-content="pageTitle"></title>
<link id="favicon" rel="icon" type="image/png">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="uber.css">
<script src="chrome://resources/js/cr.js"></script>
diff --git a/chrome/browser/resources/uber/uber_frame.html b/chrome/browser/resources/uber/uber_frame.html
index 7fddd0c..75445fb 100644
--- a/chrome/browser/resources/uber/uber_frame.html
+++ b/chrome/browser/resources/uber/uber_frame.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
+<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="uber_frame.css">
<script src="chrome://resources/js/cr.js"></script>
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index 2d6630b..23d2f5d 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc
@@ -51,9 +51,9 @@ int PathToIDR(const std::string& path) {
// In touch layout use some alternate CSS rules.
// Ideally we'd expose a touch-screen media query operator to the web
// at large, and then just use that for WebUI instead. crbug.com/123062
- if (idr == IDR_SHARED_CSS_CHROME2 &&
+ if (idr == IDR_SHARED_CSS_CHROME &&
ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
- idr = IDR_SHARED_CSS_CHROME2_TOUCH;
+ idr = IDR_SHARED_CSS_CHROME_TOUCH;
}
}
generated by cgit v1.1 at 2025-05-20 09:44:21 +0000