| Index: chrome/browser/ui/views/frame/contents_container.h
|
| diff --git a/chrome/browser/ui/views/frame/contents_container.h b/chrome/browser/ui/views/frame/contents_container.h
|
| index 9b32e2d8d5e9223462c020e2e64a989a1ad41540..0429b9f2980ec3ee6a5cd6d95cc1470197b42f38 100644
|
| --- a/chrome/browser/ui/views/frame/contents_container.h
|
| +++ b/chrome/browser/ui/views/frame/contents_container.h
|
| @@ -45,6 +45,9 @@ class ContentsContainer : public views::View, public AnimationDelegate {
|
| // Fades out the active contents.
|
| void FadeActiveContents();
|
|
|
| + // Shows the fade. This is similiar to |FadeActiveContents|, but is immediate.
|
| + void ShowFade();
|
| +
|
| // Removes the fade. This is done implicitly when the preview is made active.
|
| void RemoveFade();
|
|
|
| @@ -55,6 +58,14 @@ class ContentsContainer : public views::View, public AnimationDelegate {
|
| virtual void AnimationProgressed(const Animation* animation);
|
|
|
| private:
|
| + class OverlayContentView;
|
| +
|
| + // Creates the overlay widget. The opacity is set at |initial_opacity|.
|
| + void CreateOverlay(int initial_opacity);
|
| +
|
| + // Invoked when the contents view of the overlay is destroyed.
|
| + void OverlayViewDestroyed();
|
| +
|
| views::View* active_;
|
|
|
| views::View* preview_;
|
| @@ -65,6 +76,9 @@ class ContentsContainer : public views::View, public AnimationDelegate {
|
| // make the active view appear faded out.
|
| views::Widget* active_overlay_;
|
|
|
| + // Content view of active_overlay. Used to track when the widget is destroyed.
|
| + OverlayContentView* overlay_view_;
|
| +
|
| // Animation used to vary the opacity of active_overlay.
|
| scoped_ptr<SlideAnimation> overlay_animation_;
|
|
|
|
|