Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8232)

Unified Diff: chrome/browser/ui/views/frame/contents_container.h

Issue 5701008: Fixes bug in instant that resulted in flickery fade. The problem would (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: Adds content to 403.html as bots seem to have problem with empty file Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/contents_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/contents_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698