| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <dlfcn.h> | 7 #include <dlfcn.h> |
| 8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1812 gtk_widget_set_double_buffered(window_container_, FALSE); | 1812 gtk_widget_set_double_buffered(window_container_, FALSE); |
| 1813 gtk_widget_set_redraw_on_allocate(window_container_, TRUE); | 1813 gtk_widget_set_redraw_on_allocate(window_container_, TRUE); |
| 1814 g_signal_connect(window_container_, "expose-event", | 1814 g_signal_connect(window_container_, "expose-event", |
| 1815 G_CALLBACK(OnCustomFrameExposeThunk), this); | 1815 G_CALLBACK(OnCustomFrameExposeThunk), this); |
| 1816 gtk_container_add(GTK_CONTAINER(window_container_), window_vbox_); | 1816 gtk_container_add(GTK_CONTAINER(window_container_), window_vbox_); |
| 1817 | 1817 |
| 1818 tabstrip_.reset(new TabStripGtk(browser_->tabstrip_model(), this)); | 1818 tabstrip_.reset(new TabStripGtk(browser_->tabstrip_model(), this)); |
| 1819 tabstrip_->Init(); | 1819 tabstrip_->Init(); |
| 1820 | 1820 |
| 1821 // Build the titlebar (tabstrip + header space + min/max/close buttons). | 1821 // Build the titlebar (tabstrip + header space + min/max/close buttons). |
| 1822 titlebar_.reset(new BrowserTitlebar(this, window_)); | 1822 titlebar_.reset(CreateBrowserTitlebar()); |
| 1823 | 1823 |
| 1824 // Insert the tabstrip into the window. | 1824 // Insert the tabstrip into the window. |
| 1825 gtk_box_pack_start(GTK_BOX(window_vbox_), titlebar_->widget(), FALSE, FALSE, | 1825 gtk_box_pack_start(GTK_BOX(window_vbox_), titlebar_->widget(), FALSE, FALSE, |
| 1826 0); | 1826 0); |
| 1827 | 1827 |
| 1828 toolbar_.reset(new BrowserToolbarGtk(browser_.get(), this)); | 1828 toolbar_.reset(new BrowserToolbarGtk(browser_.get(), this)); |
| 1829 toolbar_->Init(window_); | 1829 toolbar_->Init(window_); |
| 1830 gtk_box_pack_start(GTK_BOX(window_vbox_), toolbar_->widget(), | 1830 gtk_box_pack_start(GTK_BOX(window_vbox_), toolbar_->widget(), |
| 1831 FALSE, FALSE, 0); | 1831 FALSE, FALSE, 0); |
| 1832 g_signal_connect_after(toolbar_->widget(), "expose-event", | 1832 g_signal_connect_after(toolbar_->widget(), "expose-event", |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2447 return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR); | 2447 return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR); |
| 2448 } | 2448 } |
| 2449 | 2449 |
| 2450 bool BrowserWindowGtk::UsingCustomPopupFrame() const { | 2450 bool BrowserWindowGtk::UsingCustomPopupFrame() const { |
| 2451 ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom( | 2451 ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom( |
| 2452 browser()->profile()); | 2452 browser()->profile()); |
| 2453 return !theme_provider->UsingNativeTheme() && | 2453 return !theme_provider->UsingNativeTheme() && |
| 2454 (browser()->is_type_popup() || browser()->is_type_panel()); | 2454 (browser()->is_type_popup() || browser()->is_type_panel()); |
| 2455 } | 2455 } |
| 2456 | 2456 |
| 2457 BrowserTitlebar* BrowserWindowGtk::CreateBrowserTitlebar() { |
| 2458 return new BrowserTitlebar(this, window_); |
| 2459 } |
| 2460 |
| 2457 bool BrowserWindowGtk::GetWindowEdge(int x, int y, GdkWindowEdge* edge) { | 2461 bool BrowserWindowGtk::GetWindowEdge(int x, int y, GdkWindowEdge* edge) { |
| 2458 if (!UseCustomFrame()) | 2462 if (!UseCustomFrame()) |
| 2459 return false; | 2463 return false; |
| 2460 | 2464 |
| 2461 if (IsMaximized() || IsFullscreen()) | 2465 if (IsMaximized() || IsFullscreen()) |
| 2462 return false; | 2466 return false; |
| 2463 | 2467 |
| 2464 if (x < kFrameBorderThickness) { | 2468 if (x < kFrameBorderThickness) { |
| 2465 // Left edge. | 2469 // Left edge. |
| 2466 if (y < kResizeAreaCornerSize - kTopResizeAdjust) { | 2470 if (y < kResizeAreaCornerSize - kTopResizeAdjust) { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2578 wm_type == ui::WM_OPENBOX || | 2582 wm_type == ui::WM_OPENBOX || |
| 2579 wm_type == ui::WM_XFWM4); | 2583 wm_type == ui::WM_XFWM4); |
| 2580 } | 2584 } |
| 2581 | 2585 |
| 2582 // static | 2586 // static |
| 2583 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2587 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2584 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2588 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2585 browser_window_gtk->Init(); | 2589 browser_window_gtk->Init(); |
| 2586 return browser_window_gtk; | 2590 return browser_window_gtk; |
| 2587 } | 2591 } |
| OLD | NEW |