summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-22 18:15:58 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-22 18:15:58 +0000
commit70ccf7061242e1b405f58fb423dab470d9ec69ab (patch)
treecf8a1e58792098286aa4ce6e2a4859449aa77fe5 /ui/resources
parentc7f2ef7cee78dffc7fceea096ea482750b31fad1 (diff)
downloadchromium_src-70ccf7061242e1b405f58fb423dab470d9ec69ab.zip
chromium_src-70ccf7061242e1b405f58fb423dab470d9ec69ab.tar.gz
chromium_src-70ccf7061242e1b405f58fb423dab470d9ec69ab.tar.bz2
Adds a NonClientFrameView for generic toplevel windows.Also adds a feeble (but better than what there was) attempt at sometimes updating the cursor. Will have to be replaced by a better system, but it's a start.http://crbug.com/97247TEST=none
Review URL: http://codereview.chromium.org/7977012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/aura/slab_close.pngbin0 -> 1468 bytes
-rw-r--r--ui/resources/aura/slab_zoom.pngbin0 -> 1353 bytes
-rw-r--r--ui/resources/ui_resources.grd2
3 files changed, 2 insertions, 0 deletions
diff --git a/ui/resources/aura/slab_close.png b/ui/resources/aura/slab_close.png
new file mode 100644
index 0000000..29c2a09
--- /dev/null
+++ b/ui/resources/aura/slab_close.png
Binary files differ
diff --git a/ui/resources/aura/slab_zoom.png b/ui/resources/aura/slab_zoom.png
new file mode 100644
index 0000000..f0569bb
--- /dev/null
+++ b/ui/resources/aura/slab_zoom.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index d6d8b41..3902ea3 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -125,6 +125,8 @@
<include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="aura/applist.png" type="BINDATA" />
<include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" />
<include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" />
+ <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
+ <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
</if>
</includes>
</release>