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

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 11896104: Refactor FullscreenController removing TogglePresentationMode & adding ToggleFullscreenWithChrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
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/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/defaults.h" 9 #include "chrome/browser/defaults.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 case IDC_DUPLICATE_TAB: 415 case IDC_DUPLICATE_TAB:
416 DuplicateTab(browser_); 416 DuplicateTab(browser_);
417 break; 417 break;
418 case IDC_RESTORE_TAB: 418 case IDC_RESTORE_TAB:
419 RestoreTab(browser_); 419 RestoreTab(browser_);
420 break; 420 break;
421 case IDC_SHOW_AS_TAB: 421 case IDC_SHOW_AS_TAB:
422 ConvertPopupToTabbedBrowser(browser_); 422 ConvertPopupToTabbedBrowser(browser_);
423 break; 423 break;
424 case IDC_FULLSCREEN: 424 case IDC_FULLSCREEN:
425 #if defined(OS_MACOSX)
426 chrome::ToggleFullscreenWithChrome(browser_);
427 #else
425 chrome::ToggleFullscreenMode(browser_); 428 chrome::ToggleFullscreenMode(browser_);
429 #endif
426 break; 430 break;
427 431
428 #if defined(USE_ASH) 432 #if defined(USE_ASH)
429 case IDC_TOGGLE_ASH_DESKTOP: 433 case IDC_TOGGLE_ASH_DESKTOP:
430 chrome::ToggleAshDesktop(); 434 chrome::ToggleAshDesktop();
431 break; 435 break;
432 #endif 436 #endif
433 437
434 #if defined(OS_WIN) 438 #if defined(OS_WIN)
435 // Windows 8 specific commands. 439 // Windows 8 specific commands.
436 case IDC_METRO_SNAP_ENABLE: 440 case IDC_METRO_SNAP_ENABLE:
437 browser_->SetMetroSnapMode(true); 441 browser_->SetMetroSnapMode(true);
438 break; 442 break;
439 case IDC_METRO_SNAP_DISABLE: 443 case IDC_METRO_SNAP_DISABLE:
440 browser_->SetMetroSnapMode(false); 444 browser_->SetMetroSnapMode(false);
441 break; 445 break;
442 case IDC_WIN8_DESKTOP_RESTART: 446 case IDC_WIN8_DESKTOP_RESTART:
443 browser::AttemptRestartWithModeSwitch(); 447 browser::AttemptRestartWithModeSwitch();
444 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart")); 448 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart"));
445 break; 449 break;
446 case IDC_WIN8_METRO_RESTART: 450 case IDC_WIN8_METRO_RESTART:
447 new SwichToMetroUIHandler; 451 new SwichToMetroUIHandler;
448 content::RecordAction(content::UserMetricsAction("Win8MetroRestart")); 452 content::RecordAction(content::UserMetricsAction("Win8MetroRestart"));
449 break; 453 break;
450 #endif 454 #endif
451 455
452 #if defined(OS_MACOSX) 456 #if defined(OS_MACOSX)
453 case IDC_PRESENTATION_MODE: 457 case IDC_PRESENTATION_MODE:
454 browser_->TogglePresentationMode(); 458 chrome::ToggleFullscreenMode(browser_);
455 break; 459 break;
456 #endif 460 #endif
457 case IDC_EXIT: 461 case IDC_EXIT:
458 Exit(); 462 Exit();
459 break; 463 break;
460 464
461 // Page-related commands 465 // Page-related commands
462 case IDC_SAVE_PAGE: 466 case IDC_SAVE_PAGE:
463 SavePage(browser_); 467 SavePage(browser_);
464 break; 468 break;
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 1251
1248 BrowserWindow* BrowserCommandController::window() { 1252 BrowserWindow* BrowserCommandController::window() {
1249 return browser_->window(); 1253 return browser_->window();
1250 } 1254 }
1251 1255
1252 Profile* BrowserCommandController::profile() { 1256 Profile* BrowserCommandController::profile() {
1253 return browser_->profile(); 1257 return browser_->profile();
1254 } 1258 }
1255 1259
1256 } // namespace chrome 1260 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698