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

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: 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..b0d15e34a21370be73b56e5e0377223c968f3fad 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/views/frame/browser_view.h"
tfarina 2012/09/12 14:47:51 no, no, no. You can't include this anymore!
sschmitz 2012/09/12 23:45:50 Thanks. Found a better way. Done
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -92,6 +93,16 @@ ChromeShellDelegate::~ChromeShellDelegate() {
instance_ = NULL;
}
+void ChromeShellDelegate::RemoveFullScreenExitBubble() {
+ Browser* browser = GetTargetBrowser();
+ if (!browser)
+ return;
+ BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
+ if (!browser_view)
+ return;
+ browser_view->RemoveFullScreenExitBubble();
+}
+
bool ChromeShellDelegate::IsUserLoggedIn() {
#if defined(OS_CHROMEOS)
// When running a Chrome OS build outside of a device (i.e. on a developer's
@@ -349,6 +360,11 @@ void ChromeShellDelegate::OpenFeedbackPage() {
void ChromeShellDelegate::RecordUserMetricsAction(
ash::UserMetricsAction action) {
switch (action) {
+ case ash::UMA_ACCEL_MAXIMIZE_RESTORE:
+ // TODO(sschmitz): Using the old name "Accel_Fullscreen_F4". Should we
+ // change it to Accel_Maximize_Restore_F4?
+ content::RecordAction(content::UserMetricsAction("Accel_Fullscreen_F4"));
+ break;
case ash::UMA_ACCEL_PREVWINDOW_TAB:
content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab"));
break;

Powered by Google App Engine
This is Rietveld 408576698