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 /ui/aura_shell/shell_delegate.h | |
| 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 'ui/aura_shell/shell_delegate.h')
| -rw-r--r-- | ui/aura_shell/shell_delegate.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/aura_shell/shell_delegate.h b/ui/aura_shell/shell_delegate.h index 3771b1a..1239bc8 100644 --- a/ui/aura_shell/shell_delegate.h +++ b/ui/aura_shell/shell_delegate.h @@ -50,8 +50,11 @@ class AURA_SHELL_EXPORT ShellDelegate { // an entry for |item->window| it should configure |item| appropriately and // return true. virtual bool ConfigureLauncherItem(LauncherItem* item) = 0; -}; + // Returns the resource id of the image to show on the button that creates a + // new browser window. + virtual int GetResourceIDForNewBrowserWindow() = 0; +}; } // namespace aura_shell #endif // UI_AURA_SHELL_SHELL_DELEGATE_H_ |