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

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

Issue 10915217: Hook up SetInstantPreviewHeight for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move hidden notification, too. Created 8 years, 3 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
« 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 61a59a39ddc53da592087afbcfe6290dc4f31f4e..482a0496a6dad3024b67557786790768633a1603 100644
--- a/chrome/browser/ui/views/frame/contents_container.h
+++ b/chrome/browser/ui/views/frame/contents_container.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_
#define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_
+#include "chrome/common/instant_types.h"
#include "ui/views/view.h"
namespace content {
@@ -43,8 +44,11 @@ class ContentsContainer : public views::View {
// Sets the preview view. This does not delete the old.
void SetPreview(views::WebView* preview,
- content::WebContents* preview_web_contents);
+ content::WebContents* preview_web_contents,
+ int height,
+ InstantSizeUnits units);
views::WebView* preview() { return preview_; }
+
content::WebContents* preview_web_contents() const {
return preview_web_contents_;
}
@@ -66,10 +70,17 @@ class ContentsContainer : public views::View {
views::WebView* preview_;
content::WebContents* preview_web_contents_;
+ // Returns |preview_height_| in pixels.
+ int PreviewHeightInPixels() const;
+
// The margin between the top and the active view. This is used to make the
// preview overlap the bookmark bar on the new tab page.
int active_top_margin_;
+ // The desired height of the preview and units.
+ int preview_height_;
+ InstantSizeUnits preview_height_units_;
+
DISALLOW_COPY_AND_ASSIGN(ContentsContainer);
};
« 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