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 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1433 UpdateCustomFrame(); | 1433 UpdateCustomFrame(); |
1434 toolbar_->Hide(); | 1434 toolbar_->Hide(); |
1435 tabstrip_->Hide(); | 1435 tabstrip_->Hide(); |
1436 if (bookmark_bar_.get()) | 1436 if (bookmark_bar_.get()) |
1437 gtk_widget_hide(bookmark_bar_->widget()); | 1437 gtk_widget_hide(bookmark_bar_->widget()); |
1438 bool is_kiosk = | 1438 bool is_kiosk = |
1439 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); | 1439 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); |
1440 if (!is_kiosk) { | 1440 if (!is_kiosk) { |
1441 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( | 1441 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( |
1442 GTK_FLOATING_CONTAINER(render_area_floating_container_), | 1442 GTK_FLOATING_CONTAINER(render_area_floating_container_), |
1443 browser())); | 1443 browser(), |
| 1444 GURL(), |
| 1445 false)); |
1444 } | 1446 } |
1445 gtk_widget_hide(toolbar_border_); | 1447 gtk_widget_hide(toolbar_border_); |
1446 } else { | 1448 } else { |
1447 fullscreen_exit_bubble_.reset(); | 1449 fullscreen_exit_bubble_.reset(); |
1448 UpdateCustomFrame(); | 1450 UpdateCustomFrame(); |
1449 ShowSupportedWindowFeatures(); | 1451 ShowSupportedWindowFeatures(); |
1450 } | 1452 } |
1451 } | 1453 } |
1452 | 1454 |
1453 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); | 1455 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); |
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2389 wm_name == "Openbox" || | 2391 wm_name == "Openbox" || |
2390 wm_name == "Xfwm4"); | 2392 wm_name == "Xfwm4"); |
2391 } | 2393 } |
2392 | 2394 |
2393 // static | 2395 // static |
2394 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2396 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2395 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2397 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2396 browser_window_gtk->Init(); | 2398 browser_window_gtk->Init(); |
2397 return browser_window_gtk; | 2399 return browser_window_gtk; |
2398 } | 2400 } |
OLD | NEW |