diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 21:53:23 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 21:53:23 +0000 |
| commit | 671a2aeb7136e2d7a07e18611d49fb17257f4cad (patch) | |
| tree | acdb3260b84bc64ce5090d8f5df5f732866f94bf /ui/resources | |
| parent | a643ecb54cccf5f6cdb2625150e7e4e95224f48c (diff) | |
| download | chromium_src-671a2aeb7136e2d7a07e18611d49fb17257f4cad.zip chromium_src-671a2aeb7136e2d7a07e18611d49fb17257f4cad.tar.gz chromium_src-671a2aeb7136e2d7a07e18611d49fb17257f4cad.tar.bz2 | |
Positions the launcher in the bottom left corner. Adds ShellDelegate
API to allow configuring entries that are added to the
launcher. Changes LauncherModel not to include fixed buttons (create
new window and show apps buttons).
BUG=97262
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8247012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
| -rw-r--r-- | ui/resources/ui_resources.grd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index fec1ec9..dcb3a99 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -117,6 +117,7 @@ <!-- Images only used by Aura. --> <if expr="pp_ifdef('use_aura')"> <include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-48.png" type="BINDATA" /> + <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER" file="aura/browser_instance.png" type="BINDATA" /> <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" /> |