diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 16:07:06 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 16:07:06 +0000 |
| commit | 9e34674e5ae61009b8e085fdc3e4881c09288683 (patch) | |
| tree | 8da2840388835126b4f11c9dc4118c716c65b95f /ash/shelf/shelf_util.h | |
| parent | 65c214a22389745ee6e92eaddd847ea181d3c916 (diff) | |
| download | chromium_src-9e34674e5ae61009b8e085fdc3e4881c09288683.zip chromium_src-9e34674e5ae61009b8e085fdc3e4881c09288683.tar.gz chromium_src-9e34674e5ae61009b8e085fdc3e4881c09288683.tar.bz2 | |
Revert of Remove remaining window states where window is shown with opacity 0. (https://codereview.chromium.org/237963019/)
Reason for revert:
Causing browser_test failures on main waterfall, probably due to shelf animations:
EnterpriseKioskApp
AutolaunchWarningCancel
AutolaunchWarningConfirm
KioskEnableCancel
KioskEnableConfirmed
See crbug.com/366142 for stacks.
Original issue's description:
> Remove remaining window states where window is shown with opacity 0.
>
> BUG=351553
> TEST=Unit tests pass, can enter overview mode and show/hide panels in debug mode without triggering DCHECK in window.cc.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=265330
TBR=sky@chromium.org,skuhne@chromium.org,flackr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=351553
Review URL: https://codereview.chromium.org/249063003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_util.h')
| -rw-r--r-- | ash/shelf/shelf_util.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/shelf/shelf_util.h b/ash/shelf/shelf_util.h index 7e5dae1..f4c4b80 100644 --- a/ash/shelf/shelf_util.h +++ b/ash/shelf/shelf_util.h @@ -15,11 +15,6 @@ class Window; namespace ash { -// A property key to store the id of the ShelfItem associated with the window. -extern const aura::WindowProperty<ShelfID>* const kShelfID; - -// A property key to store the resource id and title of the item shown on the -// shelf for this window. extern const aura::WindowProperty<ShelfItemDetails*>* const kShelfItemDetailsKey; |