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

Side by Side 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: remove redundant param 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/prefs/scoped_user_pref_update.h" 33 #include "chrome/browser/prefs/scoped_user_pref_update.h"
34 #include "chrome/browser/profiles/profile.h" 34 #include "chrome/browser/profiles/profile.h"
35 #include "chrome/browser/themes/theme_service.h" 35 #include "chrome/browser/themes/theme_service.h"
36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" 36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
37 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 37 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
38 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 38 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
39 #include "chrome/browser/ui/browser.h" 39 #include "chrome/browser/ui/browser.h"
40 #include "chrome/browser/ui/browser_command_controller.h" 40 #include "chrome/browser/ui/browser_command_controller.h"
41 #include "chrome/browser/ui/browser_commands.h" 41 #include "chrome/browser/ui/browser_commands.h"
42 #include "chrome/browser/ui/browser_dialogs.h" 42 #include "chrome/browser/ui/browser_dialogs.h"
43 #include "chrome/browser/ui/browser_instant_controller.h"
43 #include "chrome/browser/ui/browser_list.h" 44 #include "chrome/browser/ui/browser_list.h"
44 #include "chrome/browser/ui/browser_tabstrip.h" 45 #include "chrome/browser/ui/browser_tabstrip.h"
45 #include "chrome/browser/ui/browser_window_state.h" 46 #include "chrome/browser/ui/browser_window_state.h"
46 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 47 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
47 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 48 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
48 #include "chrome/browser/ui/gtk/accelerators_gtk.h" 49 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
49 #include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h" 50 #include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h"
50 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" 51 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h"
51 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" 52 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
52 #include "chrome/browser/ui/gtk/browser_titlebar.h" 53 #include "chrome/browser/ui/gtk/browser_titlebar.h"
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 toolbar_border_, FALSE, FALSE, 0); 1632 toolbar_border_, FALSE, FALSE, 0);
1632 gtk_widget_set_size_request(toolbar_border_, -1, 1); 1633 gtk_widget_set_size_request(toolbar_border_, -1, 1);
1633 gtk_widget_set_no_show_all(toolbar_border_, TRUE); 1634 gtk_widget_set_no_show_all(toolbar_border_, TRUE);
1634 g_signal_connect_after(toolbar_border_, "expose-event", 1635 g_signal_connect_after(toolbar_border_, "expose-event",
1635 G_CALLBACK(OnExposeDrawInfobarBitsThunk), this); 1636 G_CALLBACK(OnExposeDrawInfobarBitsThunk), this);
1636 1637
1637 if (IsToolbarSupported()) 1638 if (IsToolbarSupported())
1638 gtk_widget_show(toolbar_border_); 1639 gtk_widget_show(toolbar_border_);
1639 1640
1640 infobar_container_.reset( 1641 infobar_container_.reset(
1641 new InfoBarContainerGtk(this, 1642 new InfoBarContainerGtk(
1642 browser_->search_model(), 1643 this,
1643 browser_->profile())); 1644 browser_->search_model(),
1645 browser_->instant_controller() ?
1646 browser_->instant_controller()->instant()->model() : NULL,
1647 browser_->profile());
1644 gtk_box_pack_start(GTK_BOX(render_area_vbox_), 1648 gtk_box_pack_start(GTK_BOX(render_area_vbox_),
1645 infobar_container_->widget(), 1649 infobar_container_->widget(),
1646 FALSE, FALSE, 0); 1650 FALSE, FALSE, 0);
1647 1651
1648 status_bubble_.reset(new StatusBubbleGtk(browser_->profile())); 1652 status_bubble_.reset(new StatusBubbleGtk(browser_->profile()));
1649 1653
1650 contents_container_.reset(new TabContentsContainerGtk(status_bubble_.get())); 1654 contents_container_.reset(new TabContentsContainerGtk(status_bubble_.get()));
1651 devtools_container_.reset(new TabContentsContainerGtk(NULL)); 1655 devtools_container_.reset(new TabContentsContainerGtk(NULL));
1652 ViewIDUtil::SetID(devtools_container_->widget(), VIEW_ID_DEV_TOOLS_DOCKED); 1656 ViewIDUtil::SetID(devtools_container_->widget(), VIEW_ID_DEV_TOOLS_DOCKED);
1653 1657
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 wm_type == ui::WM_OPENBOX || 2409 wm_type == ui::WM_OPENBOX ||
2406 wm_type == ui::WM_XFWM4); 2410 wm_type == ui::WM_XFWM4);
2407 } 2411 }
2408 2412
2409 // static 2413 // static
2410 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2414 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2411 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); 2415 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
2412 browser_window_gtk->Init(); 2416 browser_window_gtk->Init();
2413 return browser_window_gtk; 2417 return browser_window_gtk;
2414 } 2418 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698