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 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1428 state_ = event->new_window_state; | 1428 state_ = event->new_window_state; |
1429 | 1429 |
1430 if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { | 1430 if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { |
1431 browser_->WindowFullscreenStateChanged(); | 1431 browser_->WindowFullscreenStateChanged(); |
1432 if (state_ & GDK_WINDOW_STATE_FULLSCREEN) { | 1432 if (state_ & GDK_WINDOW_STATE_FULLSCREEN) { |
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 = | |
1439 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); | |
1440 if (!is_kiosk) { | |
1441 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( | |
tony
2011/10/14 17:56:05
Why is this code being removed? This is to handle
jeremya
2011/10/15 01:44:55
Ah, oops -- I didn't know that :)
Fixed.
| |
1442 GTK_FLOATING_CONTAINER(render_area_floating_container_), | |
1443 browser())); | |
1444 } | |
1445 gtk_widget_hide(toolbar_border_); | 1438 gtk_widget_hide(toolbar_border_); |
1446 } else { | 1439 } else { |
1447 fullscreen_exit_bubble_.reset(); | 1440 fullscreen_exit_bubble_.reset(); |
1448 UpdateCustomFrame(); | 1441 UpdateCustomFrame(); |
1449 ShowSupportedWindowFeatures(); | 1442 ShowSupportedWindowFeatures(); |
1450 } | 1443 } |
1451 } | 1444 } |
1452 | 1445 |
1453 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); | 1446 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); |
1454 UpdateWindowShape(bounds_.width(), bounds_.height()); | 1447 UpdateWindowShape(bounds_.width(), bounds_.height()); |
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2389 wm_name == "Openbox" || | 2382 wm_name == "Openbox" || |
2390 wm_name == "Xfwm4"); | 2383 wm_name == "Xfwm4"); |
2391 } | 2384 } |
2392 | 2385 |
2393 // static | 2386 // static |
2394 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2387 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2395 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2388 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2396 browser_window_gtk->Init(); | 2389 browser_window_gtk->Init(); |
2397 return browser_window_gtk; | 2390 return browser_window_gtk; |
2398 } | 2391 } |
OLD | NEW |