| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <dlfcn.h> | 9 #include <dlfcn.h> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1568 // This vbox encompasses all of the widgets within the browser. This is | 1568 // This vbox encompasses all of the widgets within the browser. This is |
| 1569 // everything except the custom frame border. | 1569 // everything except the custom frame border. |
| 1570 window_vbox_ = gtk_vbox_new(FALSE, 0); | 1570 window_vbox_ = gtk_vbox_new(FALSE, 0); |
| 1571 gtk_widget_show(window_vbox_); | 1571 gtk_widget_show(window_vbox_); |
| 1572 | 1572 |
| 1573 // We hold an always hidden GtkMenuBar inside our browser window simply to | 1573 // We hold an always hidden GtkMenuBar inside our browser window simply to |
| 1574 // fool the Unity desktop, which will mirror the contents of the first | 1574 // fool the Unity desktop, which will mirror the contents of the first |
| 1575 // GtkMenuBar it sees into the global menu bar. (It doesn't seem to check the | 1575 // GtkMenuBar it sees into the global menu bar. (It doesn't seem to check the |
| 1576 // visibility of the GtkMenuBar, so we can just permanently hide it.) | 1576 // visibility of the GtkMenuBar, so we can just permanently hide it.) |
| 1577 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGlobalGnomeMenu)) { | 1577 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGlobalGnomeMenu)) { |
| 1578 global_menu_bar_.reset(new GlobalMenuBar(browser_.get(), this)); | 1578 global_menu_bar_.reset(new GlobalMenuBar(browser_.get())); |
| 1579 gtk_container_add(GTK_CONTAINER(window_vbox_), global_menu_bar_->widget()); | 1579 gtk_container_add(GTK_CONTAINER(window_vbox_), global_menu_bar_->widget()); |
| 1580 } | 1580 } |
| 1581 | 1581 |
| 1582 // The window container draws the custom browser frame. | 1582 // The window container draws the custom browser frame. |
| 1583 window_container_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0); | 1583 window_container_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0); |
| 1584 gtk_widget_set_name(window_container_, "chrome-custom-frame-border"); | 1584 gtk_widget_set_name(window_container_, "chrome-custom-frame-border"); |
| 1585 gtk_widget_set_app_paintable(window_container_, TRUE); | 1585 gtk_widget_set_app_paintable(window_container_, TRUE); |
| 1586 gtk_widget_set_double_buffered(window_container_, FALSE); | 1586 gtk_widget_set_double_buffered(window_container_, FALSE); |
| 1587 gtk_widget_set_redraw_on_allocate(window_container_, TRUE); | 1587 gtk_widget_set_redraw_on_allocate(window_container_, TRUE); |
| 1588 g_signal_connect(window_container_, "expose-event", | 1588 g_signal_connect(window_container_, "expose-event", |
| (...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2328 // special-case the ones where the custom frame should be used. These names | 2328 // special-case the ones where the custom frame should be used. These names |
| 2329 // are taken from the WMs' source code. | 2329 // are taken from the WMs' source code. |
| 2330 return (wm_name == "Blackbox" || | 2330 return (wm_name == "Blackbox" || |
| 2331 wm_name == "compiz" || | 2331 wm_name == "compiz" || |
| 2332 wm_name == "e16" || // Enlightenment DR16 | 2332 wm_name == "e16" || // Enlightenment DR16 |
| 2333 wm_name == "Metacity" || | 2333 wm_name == "Metacity" || |
| 2334 wm_name == "Mutter" || | 2334 wm_name == "Mutter" || |
| 2335 wm_name == "Openbox" || | 2335 wm_name == "Openbox" || |
| 2336 wm_name == "Xfwm4"); | 2336 wm_name == "Xfwm4"); |
| 2337 } | 2337 } |
| OLD | NEW |