Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 7549005: Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with (Closed) Base URL: /usr/local/google/chromium2/src@trunk
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
1454 if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { 1454 if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
1455 browser_->WindowFullscreenStateChanged(); 1455 browser_->WindowFullscreenStateChanged();
1456 if (state_ & GDK_WINDOW_STATE_FULLSCREEN) { 1456 if (state_ & GDK_WINDOW_STATE_FULLSCREEN) {
1457 UpdateCustomFrame(); 1457 UpdateCustomFrame();
1458 toolbar_->Hide(); 1458 toolbar_->Hide();
1459 tabstrip_->Hide(); 1459 tabstrip_->Hide();
1460 bool is_kiosk = 1460 bool is_kiosk =
1461 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); 1461 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
1462 if (!is_kiosk) { 1462 if (!is_kiosk) {
1463 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( 1463 fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk(
1464 GTK_FLOATING_CONTAINER(render_area_floating_container_))); 1464 GTK_FLOATING_CONTAINER(render_area_floating_container_),
1465 browser()));
1465 } 1466 }
1466 gtk_widget_hide(toolbar_border_); 1467 gtk_widget_hide(toolbar_border_);
1467 } else { 1468 } else {
1468 fullscreen_exit_bubble_.reset(); 1469 fullscreen_exit_bubble_.reset();
1469 UpdateCustomFrame(); 1470 UpdateCustomFrame();
1470 ShowSupportedWindowFeatures(); 1471 ShowSupportedWindowFeatures();
1471 } 1472 }
1472 } 1473 }
1473 1474
1474 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen()); 1475 titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen());
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
2390 // are taken from the WMs' source code. 2391 // are taken from the WMs' source code.
2391 return (wm_name == "Blackbox" || 2392 return (wm_name == "Blackbox" ||
2392 wm_name == "compiz" || 2393 wm_name == "compiz" ||
2393 wm_name == "Compiz" || 2394 wm_name == "Compiz" ||
2394 wm_name == "e16" || // Enlightenment DR16 2395 wm_name == "e16" || // Enlightenment DR16
2395 wm_name == "Metacity" || 2396 wm_name == "Metacity" ||
2396 wm_name == "Mutter" || 2397 wm_name == "Mutter" ||
2397 wm_name == "Openbox" || 2398 wm_name == "Openbox" ||
2398 wm_name == "Xfwm4"); 2399 wm_name == "Xfwm4");
2399 } 2400 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698