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 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1454 gtk_widget_hide(bookmark_bar_->widget()); | 1454 gtk_widget_hide(bookmark_bar_->widget()); |
1455 bool is_kiosk = | 1455 bool is_kiosk = |
1456 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); | 1456 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); |
1457 if (!is_kiosk && !fullscreen_exit_bubble_.get()) { | 1457 if (!is_kiosk && !fullscreen_exit_bubble_.get()) { |
1458 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( | 1458 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( |
1459 GTK_FLOATING_CONTAINER(render_area_floating_container_), | 1459 GTK_FLOATING_CONTAINER(render_area_floating_container_), |
1460 browser(), | 1460 browser(), |
1461 GURL(), | 1461 GURL(), |
1462 FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION)); | 1462 FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION)); |
1463 } | 1463 } |
| 1464 gtk_widget_hide(titlebar_widget()); |
1464 gtk_widget_hide(toolbar_border_); | 1465 gtk_widget_hide(toolbar_border_); |
1465 } else { | 1466 } else { |
| 1467 gtk_widget_show(titlebar_widget()); |
1466 fullscreen_exit_bubble_.reset(); | 1468 fullscreen_exit_bubble_.reset(); |
1467 UpdateCustomFrame(); | 1469 UpdateCustomFrame(); |
1468 ShowSupportedWindowFeatures(); | 1470 ShowSupportedWindowFeatures(); |
1469 } | 1471 } |
1470 } | 1472 } |
1471 | 1473 |
1472 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); | 1474 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); |
1473 UpdateWindowShape(bounds_.width(), bounds_.height()); | 1475 UpdateWindowShape(bounds_.width(), bounds_.height()); |
1474 SaveWindowPosition(); | 1476 SaveWindowPosition(); |
1475 return FALSE; | 1477 return FALSE; |
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2413 wm_name == "Openbox" || | 2415 wm_name == "Openbox" || |
2414 wm_name == "Xfwm4"); | 2416 wm_name == "Xfwm4"); |
2415 } | 2417 } |
2416 | 2418 |
2417 // static | 2419 // static |
2418 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2420 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2419 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2421 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2420 browser_window_gtk->Init(); | 2422 browser_window_gtk->Init(); |
2421 return browser_window_gtk; | 2423 return browser_window_gtk; |
2422 } | 2424 } |
OLD | NEW |