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_preview_controller_gtk.h" | 67 #include "chrome/browser/ui/gtk/instant_overlay_controller_gtk.h" |
68 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" | 68 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" |
69 #include "chrome/browser/ui/gtk/nine_box.h" | 69 #include "chrome/browser/ui/gtk/nine_box.h" |
70 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h" | 70 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h" |
71 #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h" | 71 #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h" |
72 #include "chrome/browser/ui/gtk/reload_button_gtk.h" | 72 #include "chrome/browser/ui/gtk/reload_button_gtk.h" |
73 #include "chrome/browser/ui/gtk/status_bubble_gtk.h" | 73 #include "chrome/browser/ui/gtk/status_bubble_gtk.h" |
74 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" | 74 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" |
75 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 75 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
76 #include "chrome/browser/ui/gtk/task_manager_gtk.h" | 76 #include "chrome/browser/ui/gtk/task_manager_gtk.h" |
77 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" | 77 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" |
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1657 // Set a white background so during startup the user sees white in the | 1657 // Set a white background so during startup the user sees white in the |
1658 // content area before we get a WebContents in place. | 1658 // content area before we get a WebContents in place. |
1659 gtk_widget_modify_bg(render_area_event_box_, GTK_STATE_NORMAL, | 1659 gtk_widget_modify_bg(render_area_event_box_, GTK_STATE_NORMAL, |
1660 &ui::kGdkWhite); | 1660 &ui::kGdkWhite); |
1661 gtk_container_add(GTK_CONTAINER(render_area_event_box_), | 1661 gtk_container_add(GTK_CONTAINER(render_area_event_box_), |
1662 render_area_floating_container_); | 1662 render_area_floating_container_); |
1663 gtk_widget_show(render_area_event_box_); | 1663 gtk_widget_show(render_area_event_box_); |
1664 gtk_box_pack_end(GTK_BOX(window_vbox_), render_area_event_box_, | 1664 gtk_box_pack_end(GTK_BOX(window_vbox_), render_area_event_box_, |
1665 TRUE, TRUE, 0); | 1665 TRUE, TRUE, 0); |
1666 | 1666 |
1667 instant_preview_controller_.reset( | 1667 instant_overlay_controller_.reset( |
1668 new InstantPreviewControllerGtk(this, contents_container_.get())); | 1668 new InstantOverlayControllerGtk(this, contents_container_.get())); |
1669 | 1669 |
1670 if (IsBookmarkBarSupported()) { | 1670 if (IsBookmarkBarSupported()) { |
1671 bookmark_bar_.reset(new BookmarkBarGtk(this, | 1671 bookmark_bar_.reset(new BookmarkBarGtk(this, |
1672 browser_.get(), | 1672 browser_.get(), |
1673 tabstrip_.get())); | 1673 tabstrip_.get())); |
1674 PlaceBookmarkBar(false); | 1674 PlaceBookmarkBar(false); |
1675 gtk_widget_show(bookmark_bar_->widget()); | 1675 gtk_widget_show(bookmark_bar_->widget()); |
1676 | 1676 |
1677 g_signal_connect_after(bookmark_bar_->widget(), "expose-event", | 1677 g_signal_connect_after(bookmark_bar_->widget(), "expose-event", |
1678 G_CALLBACK(OnBookmarkBarExposeThunk), this); | 1678 G_CALLBACK(OnBookmarkBarExposeThunk), this); |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1902 | 1902 |
1903 void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) { | 1903 void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) { |
1904 TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::MaybeShowBookmarkBar"); | 1904 TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::MaybeShowBookmarkBar"); |
1905 if (!IsBookmarkBarSupported()) | 1905 if (!IsBookmarkBarSupported()) |
1906 return; | 1906 return; |
1907 | 1907 |
1908 if (GetDisplayedTab()) | 1908 if (GetDisplayedTab()) |
1909 bookmark_bar_->SetPageNavigator(browser_.get()); | 1909 bookmark_bar_->SetPageNavigator(browser_.get()); |
1910 | 1910 |
1911 BookmarkBar::State state = browser_->bookmark_bar_state(); | 1911 BookmarkBar::State state = browser_->bookmark_bar_state(); |
1912 if (contents_container_->HasPreview() && state == BookmarkBar::DETACHED) | 1912 if (contents_container_->HasOverlay() && state == BookmarkBar::DETACHED) |
1913 state = BookmarkBar::HIDDEN; | 1913 state = BookmarkBar::HIDDEN; |
1914 | 1914 |
1915 toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED); | 1915 toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED); |
1916 PlaceBookmarkBar(state == BookmarkBar::DETACHED); | 1916 PlaceBookmarkBar(state == BookmarkBar::DETACHED); |
1917 bookmark_bar_->SetBookmarkBarState( | 1917 bookmark_bar_->SetBookmarkBarState( |
1918 state, | 1918 state, |
1919 animate ? BookmarkBar::ANIMATE_STATE_CHANGE : | 1919 animate ? BookmarkBar::ANIMATE_STATE_CHANGE : |
1920 BookmarkBar::DONT_ANIMATE_STATE_CHANGE); | 1920 BookmarkBar::DONT_ANIMATE_STATE_CHANGE); |
1921 } | 1921 } |
1922 | 1922 |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2361 wm_type == ui::WM_OPENBOX || | 2361 wm_type == ui::WM_OPENBOX || |
2362 wm_type == ui::WM_XFWM4); | 2362 wm_type == ui::WM_XFWM4); |
2363 } | 2363 } |
2364 | 2364 |
2365 // static | 2365 // static |
2366 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2366 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2367 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2367 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2368 browser_window_gtk->Init(); | 2368 browser_window_gtk->Init(); |
2369 return browser_window_gtk; | 2369 return browser_window_gtk; |
2370 } | 2370 } |
OLD | NEW |