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

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

Issue 13684002: cros: Instant extended support for immersive fullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 months 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
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 410ec0c10c9eb79bc0696e630ce689bd7b8f460a..9af067b148fab08c96e114f746397af590210a69 100644
--- a/chrome/browser/ui/views/frame/contents_container.h
+++ b/chrome/browser/ui/views/frame/contents_container.h
@@ -60,8 +60,14 @@ class ContentsContainer : public views::View,
// Sets the active top margin; the active WebView's y origin would be
// positioned at this |margin|, causing the active WebView to be pushed down
- // vertically by |margin| pixels in the |ContentsContainer|.
- void SetActiveTopMargin(int margin);
+ // vertically by |margin| pixels in the |ContentsContainer|. Returns true
+ // if the margin changed and this view needs Layout().
+ bool SetActiveTopMargin(int margin);
+
+ // Sets a vertical offset of |margin| pixels for the |overlay_| content,
+ // similar to SetActiveTopMargin(). Returns true if the margin changed and
+ // this view needs Layout().
+ bool SetOverlayTopMargin(int margin);
// Returns the bounds the overlay would be shown at.
gfx::Rect GetOverlayBounds() const;
@@ -75,11 +81,15 @@ class ContentsContainer : public views::View,
// the content page.
bool IsOverlayFullHeight() const;
- private:
// Overridden from views::View:
virtual void Layout() OVERRIDE;
virtual std::string GetClassName() const OVERRIDE;
+ // Testing interface:
+ views::WebView* GetActiveWebViewForTest() { return active_; }
+ views::WebView* GetOverlayWebViewForTest() { return overlay_; }
+
+ private:
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
@@ -95,6 +105,11 @@ class ContentsContainer : public views::View,
// overlay overlap the bookmark bar on the new tab page.
int active_top_margin_;
+ // The margin between the top of this view and the overlay view. Used to
+ // push down the instant extended suggestions during an immersive fullscreen
+ // reveal.
+ int overlay_top_margin_;
+
// The desired height of the overlay and units.
int overlay_height_;
InstantSizeUnits overlay_height_units_;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_layout.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