chrome/browser/ui/gtk/browser_window_gtk.cc - Issue 12036075: alternate ntp: fix website page jankiness when suggestions show and top bars are hidden

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 12036075: alternate ntp: fix website page jankiness when suggestions show and top bars are hidden (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed all comments Created 7 years, 11 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/browser.cc ('k') | chrome/browser/ui/gtk/infobars/infobar_container_gtk.h » ('j') | chrome/browser/ui/views/frame/browser_view_layout.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/browser_window_gtk.cc

diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc

index cf865e663f41f1b4d9e28a54e12cc9a0289a0763..7f3bb4e482c39a29cf4b404bbe508d4ddae7b8ad 100644

--- a/chrome/browser/ui/gtk/browser_window_gtk.cc

+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc

@@ -40,6 +40,7 @@

#include "chrome/browser/ui/browser_command_controller.h"

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/browser_dialogs.h"

+#include "chrome/browser/ui/browser_instant_controller.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window_state.h"

@@ -1638,9 +1639,12 @@ void BrowserWindowGtk::InitWidgets() {

gtk_widget_show(toolbar_border_);

infobar_container_.reset(

- new InfoBarContainerGtk(this,

- browser_->search_model(),

- browser_->profile()));

+ new InfoBarContainerGtk(

+ this,

+ browser_->search_model(),

+ browser_->instant_controller() ?

+ browser_->instant_controller()->instant()->model() : NULL,

+ browser_->profile());

gtk_box_pack_start(GTK_BOX(render_area_vbox_),

infobar_container_->widget(),

FALSE, FALSE, 0);