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

Side by Side 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: rebase 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 unified diff | Download patch
« no previous file with comments | « ash/wm/window_util.cc ('k') | chrome/browser/ui/views/accelerator_table_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 return new UserActionHandler; 342 return new UserActionHandler;
343 } 343 }
344 344
345 void ChromeShellDelegate::OpenFeedbackPage() { 345 void ChromeShellDelegate::OpenFeedbackPage() {
346 chrome::OpenFeedbackDialog(GetTargetBrowser()); 346 chrome::OpenFeedbackDialog(GetTargetBrowser());
347 } 347 }
348 348
349 void ChromeShellDelegate::RecordUserMetricsAction( 349 void ChromeShellDelegate::RecordUserMetricsAction(
350 ash::UserMetricsAction action) { 350 ash::UserMetricsAction action) {
351 switch (action) { 351 switch (action) {
352 case ash::UMA_ACCEL_MAXIMIZE_RESTORE_F4:
353 content::RecordAction(
354 content::UserMetricsAction("Accel_Maximize_Restore_F4"));
355 break;
352 case ash::UMA_ACCEL_PREVWINDOW_TAB: 356 case ash::UMA_ACCEL_PREVWINDOW_TAB:
353 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab")); 357 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab"));
354 break; 358 break;
355 case ash::UMA_ACCEL_NEXTWINDOW_TAB: 359 case ash::UMA_ACCEL_NEXTWINDOW_TAB:
356 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab")); 360 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab"));
357 break; 361 break;
358 case ash::UMA_ACCEL_PREVWINDOW_F5: 362 case ash::UMA_ACCEL_PREVWINDOW_F5:
359 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5")); 363 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5"));
360 break; 364 break;
361 case ash::UMA_ACCEL_NEXTWINDOW_F5: 365 case ash::UMA_ACCEL_NEXTWINDOW_F5:
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 ash::Shell::GetInstance()->ShowLauncher(); 421 ash::Shell::GetInstance()->ShowLauncher();
418 break; 422 break;
419 default: 423 default:
420 NOTREACHED() << "Unexpected notification " << type; 424 NOTREACHED() << "Unexpected notification " << type;
421 } 425 }
422 #else 426 #else
423 // MSVC++ warns about switch statements without any cases. 427 // MSVC++ warns about switch statements without any cases.
424 NOTREACHED() << "Unexpected notification " << type; 428 NOTREACHED() << "Unexpected notification " << type;
425 #endif 429 #endif
426 } 430 }
OLDNEW
« no previous file with comments | « ash/wm/window_util.cc ('k') | chrome/browser/ui/views/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698