summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authordewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 21:21:23 +0000
committerdewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 21:21:23 +0000
commit0bafa48d4686e35d6ff229d835e38fd782d3d436 (patch)
tree451f449a9e9e067c9cbd696bcdfe9905820877dd /ui/resources
parentfd9f0ce7e8042b633cb0b246bf80d370e04d4ba3 (diff)
downloadchromium_src-0bafa48d4686e35d6ff229d835e38fd782d3d436.zip
chromium_src-0bafa48d4686e35d6ff229d835e38fd782d3d436.tar.gz
chromium_src-0bafa48d4686e35d6ff229d835e38fd782d3d436.tar.bz2
Reland 232439: Add a way for notifications to be linked from settings dialog.
Adds an event, onShowSettings, that is fired when the link is clicked. The link is only shown when the event is subscribed to. TBR=miket@chromium.org,oshima@chromium.org,rsesek@chromium.org,mukai@chromium.org BUG=304208, 286608 Review URL: https://codereview.chromium.org/54673015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/default_100_percent/common/notification_advanced_settings.pngbin0 -> 179 bytes
-rw-r--r--ui/resources/default_100_percent/common/notification_advanced_settings_hover.pngbin0 -> 179 bytes
-rw-r--r--ui/resources/default_100_percent/common/notification_advanced_settings_pressed.pngbin0 -> 179 bytes
-rw-r--r--ui/resources/default_200_percent/common/notification_advanced_settings.pngbin0 -> 282 bytes
-rw-r--r--ui/resources/default_200_percent/common/notification_advanced_settings_hover.pngbin0 -> 282 bytes
-rw-r--r--ui/resources/default_200_percent/common/notification_advanced_settings_pressed.pngbin0 -> 277 bytes
-rw-r--r--ui/resources/ui_resources.grd3
7 files changed, 3 insertions, 0 deletions
diff --git a/ui/resources/default_100_percent/common/notification_advanced_settings.png b/ui/resources/default_100_percent/common/notification_advanced_settings.png
new file mode 100644
index 0000000..f3c7a58
--- /dev/null
+++ b/ui/resources/default_100_percent/common/notification_advanced_settings.png
Binary files differ
diff --git a/ui/resources/default_100_percent/common/notification_advanced_settings_hover.png b/ui/resources/default_100_percent/common/notification_advanced_settings_hover.png
new file mode 100644
index 0000000..b5496d4
--- /dev/null
+++ b/ui/resources/default_100_percent/common/notification_advanced_settings_hover.png
Binary files differ
diff --git a/ui/resources/default_100_percent/common/notification_advanced_settings_pressed.png b/ui/resources/default_100_percent/common/notification_advanced_settings_pressed.png
new file mode 100644
index 0000000..929e91b
--- /dev/null
+++ b/ui/resources/default_100_percent/common/notification_advanced_settings_pressed.png
Binary files differ
diff --git a/ui/resources/default_200_percent/common/notification_advanced_settings.png b/ui/resources/default_200_percent/common/notification_advanced_settings.png
new file mode 100644
index 0000000..8db4cc4
--- /dev/null
+++ b/ui/resources/default_200_percent/common/notification_advanced_settings.png
Binary files differ
diff --git a/ui/resources/default_200_percent/common/notification_advanced_settings_hover.png b/ui/resources/default_200_percent/common/notification_advanced_settings_hover.png
new file mode 100644
index 0000000..d3880f8
--- /dev/null
+++ b/ui/resources/default_200_percent/common/notification_advanced_settings_hover.png
Binary files differ
diff --git a/ui/resources/default_200_percent/common/notification_advanced_settings_pressed.png b/ui/resources/default_200_percent/common/notification_advanced_settings_pressed.png
new file mode 100644
index 0000000..ed55d30
--- /dev/null
+++ b/ui/resources/default_200_percent/common/notification_advanced_settings_pressed.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 2e17560f..0a323cf 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -272,6 +272,9 @@
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW" file="common/notification_arrow.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_HOVER" file="common/notification_arrow_hover.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_PRESSED" file="common/notification_arrow_pressed.png"/>
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ADVANCED_SETTINGS" file="common/notification_advanced_settings.png"/>
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ADVANCED_SETTINGS_HOVER" file="common/notification_advanced_settings_hover.png"/>
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ADVANCED_SETTINGS_PRESSED" file="common/notification_advanced_settings_pressed.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL" file="common/notification_clear_all.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_DISABLED" file="common/notification_clear_all_disabled.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_HOVER" file="common/notification_clear_all_hover.png"/>