| OLD | NEW |
| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h" | 57 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h" |
| 58 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h" | 58 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h" |
| 59 #include "chrome/browser/ui/gtk/find_bar_gtk.h" | 59 #include "chrome/browser/ui/gtk/find_bar_gtk.h" |
| 60 #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" | 60 #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" |
| 61 #include "chrome/browser/ui/gtk/global_menu_bar.h" | 61 #include "chrome/browser/ui/gtk/global_menu_bar.h" |
| 62 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 62 #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
| 63 #include "chrome/browser/ui/gtk/gtk_util.h" | 63 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 64 #include "chrome/browser/ui/gtk/gtk_window_util.h" | 64 #include "chrome/browser/ui/gtk/gtk_window_util.h" |
| 65 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" | 65 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" |
| 66 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" | 66 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" |
| 67 #include "chrome/browser/ui/gtk/instant_overlay_controller_gtk.h" | |
| 68 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" | 67 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" |
| 69 #include "chrome/browser/ui/gtk/nine_box.h" | 68 #include "chrome/browser/ui/gtk/nine_box.h" |
| 70 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h" | 69 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h" |
| 71 #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h" | 70 #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h" |
| 72 #include "chrome/browser/ui/gtk/reload_button_gtk.h" | 71 #include "chrome/browser/ui/gtk/reload_button_gtk.h" |
| 73 #include "chrome/browser/ui/gtk/status_bubble_gtk.h" | 72 #include "chrome/browser/ui/gtk/status_bubble_gtk.h" |
| 74 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" | 73 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" |
| 75 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 74 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| 76 #include "chrome/browser/ui/gtk/task_manager_gtk.h" | 75 #include "chrome/browser/ui/gtk/task_manager_gtk.h" |
| 77 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" | 76 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" |
| (...skipping 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1679 // Set a white background so during startup the user sees white in the | 1678 // Set a white background so during startup the user sees white in the |
| 1680 // content area before we get a WebContents in place. | 1679 // content area before we get a WebContents in place. |
| 1681 gtk_widget_modify_bg(render_area_event_box_, GTK_STATE_NORMAL, | 1680 gtk_widget_modify_bg(render_area_event_box_, GTK_STATE_NORMAL, |
| 1682 &ui::kGdkWhite); | 1681 &ui::kGdkWhite); |
| 1683 gtk_container_add(GTK_CONTAINER(render_area_event_box_), | 1682 gtk_container_add(GTK_CONTAINER(render_area_event_box_), |
| 1684 render_area_floating_container_); | 1683 render_area_floating_container_); |
| 1685 gtk_widget_show(render_area_event_box_); | 1684 gtk_widget_show(render_area_event_box_); |
| 1686 gtk_box_pack_end(GTK_BOX(window_vbox_), render_area_event_box_, | 1685 gtk_box_pack_end(GTK_BOX(window_vbox_), render_area_event_box_, |
| 1687 TRUE, TRUE, 0); | 1686 TRUE, TRUE, 0); |
| 1688 | 1687 |
| 1689 instant_overlay_controller_.reset( | |
| 1690 new InstantOverlayControllerGtk(this, contents_container_.get())); | |
| 1691 | |
| 1692 if (IsBookmarkBarSupported()) { | 1688 if (IsBookmarkBarSupported()) { |
| 1693 bookmark_bar_.reset(new BookmarkBarGtk(this, | 1689 bookmark_bar_.reset(new BookmarkBarGtk(this, |
| 1694 browser_.get(), | 1690 browser_.get(), |
| 1695 tabstrip_.get())); | 1691 tabstrip_.get())); |
| 1696 PlaceBookmarkBar(false); | 1692 PlaceBookmarkBar(false); |
| 1697 gtk_widget_show(bookmark_bar_->widget()); | 1693 gtk_widget_show(bookmark_bar_->widget()); |
| 1698 | 1694 |
| 1699 g_signal_connect_after(bookmark_bar_->widget(), "expose-event", | 1695 g_signal_connect_after(bookmark_bar_->widget(), "expose-event", |
| 1700 G_CALLBACK(OnBookmarkBarExposeThunk), this); | 1696 G_CALLBACK(OnBookmarkBarExposeThunk), this); |
| 1701 g_signal_connect(bookmark_bar_->widget(), "size-allocate", | 1697 g_signal_connect(bookmark_bar_->widget(), "size-allocate", |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2405 wm_type == ui::WM_OPENBOX || | 2401 wm_type == ui::WM_OPENBOX || |
| 2406 wm_type == ui::WM_XFWM4); | 2402 wm_type == ui::WM_XFWM4); |
| 2407 } | 2403 } |
| 2408 | 2404 |
| 2409 // static | 2405 // static |
| 2410 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2406 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2411 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2407 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2412 browser_window_gtk->Init(); | 2408 browser_window_gtk->Init(); |
| 2413 return browser_window_gtk; | 2409 return browser_window_gtk; |
| 2414 } | 2410 } |
| OLD | NEW |