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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 10914231: Map fullscreen button to maximize (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix for review issues Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 2a44a9e01a4b6929665de6041c924057f1f57a46..798ab4690f19a28e964c34e71214e7cd9f4a0790 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -349,6 +350,10 @@ void ChromeShellDelegate::OpenFeedbackPage() {
void ChromeShellDelegate::RecordUserMetricsAction(
ash::UserMetricsAction action) {
switch (action) {
+ case ash::UMA_ACCEL_MAXIMIZE_RESTORE:
+ content::RecordAction(
+ content::UserMetricsAction("Accel_Maximize_Restore_F4"));
+ break;
case ash::UMA_ACCEL_PREVWINDOW_TAB:
content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab"));
break;
@@ -405,6 +410,17 @@ string16 ChromeShellDelegate::GetTimeRemainingString(base::TimeDelta delta) {
return TimeFormat::TimeRemaining(delta);
}
+void ChromeShellDelegate::ToggleFullscreenMode() {
+ Browser* browser = GetTargetBrowser();
+ if (!browser)
+ return;
+ FullscreenController* fullscreen_controller =
+ browser->fullscreen_controller();
+ if (!fullscreen_controller)
+ return;
+ fullscreen_controller->ToggleFullscreenMode();
+}
+
void ChromeShellDelegate::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {

Powered by Google App Engine
This is Rietveld 408576698