| OLD | NEW | 
|---|
| 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 "base/command_line.h" | 7 #include "base/command_line.h" | 
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" | 
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" | 
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" | 
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 519       break; | 519       break; | 
| 520     case IDC_PIN_TO_START_SCREEN: | 520     case IDC_PIN_TO_START_SCREEN: | 
| 521       TogglePagePinnedToStartScreen(browser_); | 521       TogglePagePinnedToStartScreen(browser_); | 
| 522       break; | 522       break; | 
| 523 #endif | 523 #endif | 
| 524 | 524 | 
| 525 #if defined(OS_MACOSX) | 525 #if defined(OS_MACOSX) | 
| 526     case IDC_PRESENTATION_MODE: | 526     case IDC_PRESENTATION_MODE: | 
| 527       chrome::ToggleFullscreenMode(browser_); | 527       chrome::ToggleFullscreenMode(browser_); | 
| 528       break; | 528       break; | 
|  | 529     case IDC_HIDE_FULLSCREEN_TOOLBAR: | 
|  | 530       chrome::ToggleFullscreenToolbar(browser_); | 
|  | 531       break; | 
| 529 #endif | 532 #endif | 
| 530     case IDC_EXIT: | 533     case IDC_EXIT: | 
| 531       Exit(); | 534       Exit(); | 
| 532       break; | 535       break; | 
| 533 | 536 | 
| 534     // Page-related commands | 537     // Page-related commands | 
| 535     case IDC_SAVE_PAGE: | 538     case IDC_SAVE_PAGE: | 
| 536       SavePage(browser_); | 539       SavePage(browser_); | 
| 537       break; | 540       break; | 
| 538     case IDC_BOOKMARK_PAGE: | 541     case IDC_BOOKMARK_PAGE: | 
| (...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1282   if (window_state == WINDOW_STATE_NOT_FULLSCREEN && | 1285   if (window_state == WINDOW_STATE_NOT_FULLSCREEN && | 
| 1283       !profile()->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed)) { | 1286       !profile()->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed)) { | 
| 1284     // Disable toggling into fullscreen mode if disallowed by pref. | 1287     // Disable toggling into fullscreen mode if disallowed by pref. | 
| 1285     fullscreen_enabled = false; | 1288     fullscreen_enabled = false; | 
| 1286   } | 1289   } | 
| 1287 #endif | 1290 #endif | 
| 1288 | 1291 | 
| 1289   command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, fullscreen_enabled); | 1292   command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, fullscreen_enabled); | 
| 1290   command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE, | 1293   command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE, | 
| 1291                                         fullscreen_enabled); | 1294                                         fullscreen_enabled); | 
|  | 1295   command_updater_.UpdateCommandEnabled(IDC_HIDE_FULLSCREEN_TOOLBAR, | 
|  | 1296                                         fullscreen_enabled); | 
| 1292 | 1297 | 
| 1293   UpdateCommandsForBookmarkBar(); | 1298   UpdateCommandsForBookmarkBar(); | 
| 1294 } | 1299 } | 
| 1295 | 1300 | 
| 1296 void BrowserCommandController::UpdatePrintingState() { | 1301 void BrowserCommandController::UpdatePrintingState() { | 
| 1297   bool print_enabled = CanPrint(browser_); | 1302   bool print_enabled = CanPrint(browser_); | 
| 1298   command_updater_.UpdateCommandEnabled(IDC_PRINT, print_enabled); | 1303   command_updater_.UpdateCommandEnabled(IDC_PRINT, print_enabled); | 
| 1299 #if defined(ENABLE_BASIC_PRINTING) | 1304 #if defined(ENABLE_BASIC_PRINTING) | 
| 1300   command_updater_.UpdateCommandEnabled(IDC_BASIC_PRINT, | 1305   command_updater_.UpdateCommandEnabled(IDC_BASIC_PRINT, | 
| 1301                                         CanBasicPrint(browser_)); | 1306                                         CanBasicPrint(browser_)); | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1373 | 1378 | 
| 1374 BrowserWindow* BrowserCommandController::window() { | 1379 BrowserWindow* BrowserCommandController::window() { | 
| 1375   return browser_->window(); | 1380   return browser_->window(); | 
| 1376 } | 1381 } | 
| 1377 | 1382 | 
| 1378 Profile* BrowserCommandController::profile() { | 1383 Profile* BrowserCommandController::profile() { | 
| 1379   return browser_->profile(); | 1384   return browser_->profile(); | 
| 1380 } | 1385 } | 
| 1381 | 1386 | 
| 1382 }  // namespace chrome | 1387 }  // namespace chrome | 
| OLD | NEW | 
|---|