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

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: Merge TOT Created 7 years, 10 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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 case IDC_DUPLICATE_TAB: 414 case IDC_DUPLICATE_TAB:
415 DuplicateTab(browser_); 415 DuplicateTab(browser_);
416 break; 416 break;
417 case IDC_RESTORE_TAB: 417 case IDC_RESTORE_TAB:
418 RestoreTab(browser_); 418 RestoreTab(browser_);
419 break; 419 break;
420 case IDC_SHOW_AS_TAB: 420 case IDC_SHOW_AS_TAB:
421 ConvertPopupToTabbedBrowser(browser_); 421 ConvertPopupToTabbedBrowser(browser_);
422 break; 422 break;
423 case IDC_FULLSCREEN: 423 case IDC_FULLSCREEN:
424 #if defined(OS_MACOSX)
425 chrome::ToggleFullscreenWithChrome(browser_);
426 #else
424 chrome::ToggleFullscreenMode(browser_); 427 chrome::ToggleFullscreenMode(browser_);
428 #endif
425 break; 429 break;
426 430
427 #if defined(USE_ASH) 431 #if defined(USE_ASH)
428 case IDC_TOGGLE_ASH_DESKTOP: 432 case IDC_TOGGLE_ASH_DESKTOP:
429 chrome::ToggleAshDesktop(); 433 chrome::ToggleAshDesktop();
430 break; 434 break;
431 #endif 435 #endif
432 436
433 #if defined(OS_WIN) 437 #if defined(OS_WIN)
434 // Windows 8 specific commands. 438 // Windows 8 specific commands.
435 case IDC_METRO_SNAP_ENABLE: 439 case IDC_METRO_SNAP_ENABLE:
436 browser_->SetMetroSnapMode(true); 440 browser_->SetMetroSnapMode(true);
437 break; 441 break;
438 case IDC_METRO_SNAP_DISABLE: 442 case IDC_METRO_SNAP_DISABLE:
439 browser_->SetMetroSnapMode(false); 443 browser_->SetMetroSnapMode(false);
440 break; 444 break;
441 case IDC_WIN8_DESKTOP_RESTART: 445 case IDC_WIN8_DESKTOP_RESTART:
442 browser::AttemptRestartWithModeSwitch(); 446 browser::AttemptRestartWithModeSwitch();
443 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart")); 447 content::RecordAction(content::UserMetricsAction("Win8DesktopRestart"));
444 break; 448 break;
445 case IDC_WIN8_METRO_RESTART: 449 case IDC_WIN8_METRO_RESTART:
446 new SwichToMetroUIHandler; 450 new SwichToMetroUIHandler;
447 content::RecordAction(content::UserMetricsAction("Win8MetroRestart")); 451 content::RecordAction(content::UserMetricsAction("Win8MetroRestart"));
448 break; 452 break;
449 #endif 453 #endif
450 454
451 #if defined(OS_MACOSX) 455 #if defined(OS_MACOSX)
452 case IDC_PRESENTATION_MODE: 456 case IDC_PRESENTATION_MODE:
453 browser_->TogglePresentationMode(); 457 chrome::ToggleFullscreenMode(browser_);
454 break; 458 break;
455 #endif 459 #endif
456 case IDC_EXIT: 460 case IDC_EXIT:
457 Exit(); 461 Exit();
458 break; 462 break;
459 463
460 // Page-related commands 464 // Page-related commands
461 case IDC_SAVE_PAGE: 465 case IDC_SAVE_PAGE:
462 SavePage(browser_); 466 SavePage(browser_);
463 break; 467 break;
(...skipping 783 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