summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/theme_resources_large.grd12
-rw-r--r--chrome/app/theme/theme_resources_standard.grd12
-rw-r--r--chrome/browser/ui/views/bubble/bubble_border.cc4
-rw-r--r--chrome/chrome.gyp2
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--tools/grit/resource_ids7
-rw-r--r--ui/resources/ui_resources_large.grd31
-rw-r--r--ui/resources/ui_resources_standard.grd31
-rw-r--r--ui/ui_resources.gypi34
9 files changed, 26 insertions, 109 deletions
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index b01a89d..d74562a 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -40,6 +40,18 @@
<include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
<include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
</if>
+ <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR" file="large_close_bar.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_H" file="large_close_bar_h.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_MASK" file="large_close_bar_mask.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 4cf171d..9a15c8c 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -40,6 +40,18 @@
<include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
<include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
</if>
+ <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
+ <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
diff --git a/chrome/browser/ui/views/bubble/bubble_border.cc b/chrome/browser/ui/views/bubble/bubble_border.cc
index 9cd36d5..98c3f3d 100644
--- a/chrome/browser/ui/views/bubble/bubble_border.cc
+++ b/chrome/browser/ui/views/bubble/bubble_border.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ui/views/bubble/bubble_border.h"
#include "base/logging.h"
-#include "grit/ui_resources.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas_skia.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a535e7b..b1c3ba9 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1647,12 +1647,10 @@
['touchui==0', {
'pak_inputs': [
'<(grit_out_dir)/theme_resources_standard.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
],
}, { # else: touchui!=0
'pak_inputs': [
'<(grit_out_dir)/theme_resources_large.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',
],
}],
],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f5e00fe..933d1d3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -51,8 +51,6 @@
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/surface/surface.gyp:surface',
'../ui/ui.gyp:ui_resources',
- '../ui/ui.gyp:ui_resources_large',
- '../ui/ui.gyp:ui_resources_standard',
'../webkit/support/webkit_support.gyp:appcache',
'../webkit/support/webkit_support.gyp:blob',
'../webkit/support/webkit_support.gyp:database',
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index affa258..bc06192 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -154,11 +154,4 @@
"chrome/browser/resources/workers_resources.grd": {
"includes": [23500],
},
- # All standard and large theme resources should have the same IDs.
- "ui/resources/ui_resources_standard.grd": {
- "includes": [24000],
- },
- "ui/resources/ui_resources_large.grd": {
- "includes": [24000],
- },
}
diff --git a/ui/resources/ui_resources_large.grd b/ui/resources/ui_resources_large.grd
deleted file mode 100644
index b653b06..0000000
--- a/ui/resources/ui_resources_large.grd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
- <outputs>
- <output filename="grit/ui_resources_large.h" type="rc_header">
- <emit emit_type='prepend'></emit>
- </output>
- <output filename="grit/ui_resources_large_map.cc" type="resource_map_source" />
- <output filename="grit/ui_resources_large_map.h" type="resource_map_header" />
- <output filename="ui_resources_large.pak" type="data_package" />
- <output filename="ui_resources_large.rc" type="rc_all" />
- </outputs>
- <release seq="1">
- <includes>
- <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
- theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE
- MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
- <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" />
- <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" />
- <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" />
- <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type="BINDATA" />
- <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" />
- <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type="BINDATA" />
- <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" />
- <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type="BINDATA" />
- <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" />
- <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" />
- <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" />
- <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
- </includes>
- </release>
-</grit>
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
deleted file mode 100644
index c526763..0000000
--- a/ui/resources/ui_resources_standard.grd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
- <outputs>
- <output filename="grit/ui_resources_standard.h" type="rc_header">
- <emit emit_type='prepend'></emit>
- </output>
- <output filename="grit/ui_resources_standard_map.cc" type="resource_map_source" />
- <output filename="grit/ui_resources_standard_map.h" type="resource_map_header" />
- <output filename="ui_resources_standard.pak" type="data_package" />
- <output filename="ui_resources_standard.rc" type="rc_all" />
- </outputs>
- <release seq="1">
- <includes>
- <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
- theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE
- MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
- <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
- <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
- <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
- <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDATA" />
- <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
- <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDATA" />
- <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
- <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDATA" />
- <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
- <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
- <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
- <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDATA" />
- </includes>
- </release>
-</grit>
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index e7d6476..2f4cf6e 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -21,39 +21,5 @@
],
'includes': [ '../build/grit_target.gypi' ],
},
- {
- 'target_name': 'ui_resources_large',
- 'type': 'none',
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large',
- },
- 'actions': [
- {
- 'action_name': 'ui_resources_large',
- 'variables': {
- 'grit_grd_file': 'resources/ui_resources_large.grd',
- },
- 'includes': [ '../build/grit_action.gypi' ],
- },
- ],
- 'includes': [ '../build/grit_target.gypi' ],
- },
- {
- 'target_name': 'ui_resources_standard',
- 'type': 'none',
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard',
- },
- 'actions': [
- {
- 'action_name': 'ui_resources_standard',
- 'variables': {
- 'grit_grd_file': 'resources/ui_resources_standard.grd',
- },
- 'includes': [ '../build/grit_action.gypi' ],
- },
- ],
- 'includes': [ '../build/grit_target.gypi' ],
- },
],
}
generated by cgit v1.1 at 2025-02-01 04:54:51 +0000