diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 22:15:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 22:15:16 +0000 |
| commit | a3469db484c2b23b4fccd8af2e8cce8692749dc0 (patch) | |
| tree | 7841ddf4c47bad4574161a284cbc3ca3ef1a66ec /chrome/browser/ui | |
| parent | f081395e06004d74846b632a6151af2317b0234b (diff) | |
| download | chromium_src-a3469db484c2b23b4fccd8af2e8cce8692749dc0.zip chromium_src-a3469db484c2b23b4fccd8af2e8cce8692749dc0.tar.gz chromium_src-a3469db484c2b23b4fccd8af2e8cce8692749dc0.tar.bz2 | |
Relands fixes for 106432, 107287 and 107401. These got reverted
together, so I'm relanding together. Here's the original descriptions:
Fixes layout bugs in ShelfLayoutManager. The problem with invoking
SetBounds on the widget during the animation is we end up back in the
layoutmanager and cancel the change. Also adds some tests for
ShelfLayoutManager.
and
Create a visible shelf and constrain window movement
This also includes the fix, which you reviewed @
http://codereview.chromium.org/8914012 .
BUG=106432 107287 107401
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8914023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/aura/chrome_shell_delegate.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/views/aura/chrome_shell_delegate.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc index fdfee85..631c752 100644 --- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc +++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc @@ -9,6 +9,7 @@ #include "chrome/browser/ui/views/aura/app_list_window.h" #include "chrome/browser/ui/views/aura/status_area_host_aura.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "grit/theme_resources.h" #include "ui/aura/window.h" #include "ui/aura_shell/launcher/launcher_types.h" #include "ui/aura_shell/window_util.h" @@ -76,3 +77,7 @@ bool ChromeShellDelegate::ConfigureLauncherItem( return view && ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type)); } + +int ChromeShellDelegate::GetResourceIDForNewBrowserWindow() { + return IDR_PRODUCT_LOGO_32; +} diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h index a524f30..eb355d3 100644 --- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h +++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h @@ -44,6 +44,7 @@ class ChromeShellDelegate : public aura_shell::ShellDelegate { virtual void LauncherItemClicked( const aura_shell::LauncherItem& item) OVERRIDE; virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE; + virtual int GetResourceIDForNewBrowserWindow() OVERRIDE; private: static ChromeShellDelegate* instance_; |