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

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

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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
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 "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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 break; 536 break;
537 case IDC_VIEW_SOURCE: 537 case IDC_VIEW_SOURCE:
538 ViewSelectedSource(browser_); 538 ViewSelectedSource(browser_);
539 break; 539 break;
540 case IDC_EMAIL_PAGE_LOCATION: 540 case IDC_EMAIL_PAGE_LOCATION:
541 EmailPageLocation(browser_); 541 EmailPageLocation(browser_);
542 break; 542 break;
543 case IDC_PRINT: 543 case IDC_PRINT:
544 Print(browser_); 544 Print(browser_);
545 break; 545 break;
546 #if !defined(DISABLE_BASIC_PRINTING) 546 #if defined(ENABLE_BASIC_PRINTING)
547 case IDC_BASIC_PRINT: 547 case IDC_BASIC_PRINT:
548 content::RecordAction(base::UserMetricsAction("Accel_Advanced_Print")); 548 content::RecordAction(base::UserMetricsAction("Accel_Advanced_Print"));
549 BasicPrint(browser_); 549 BasicPrint(browser_);
550 break; 550 break;
551 #endif // !DISABLE_BASIC_PRINTING 551 #endif // ENABLE_BASIC_PRINTING
552 case IDC_TRANSLATE_PAGE: 552 case IDC_TRANSLATE_PAGE:
553 Translate(browser_); 553 Translate(browser_);
554 break; 554 break;
555 case IDC_MANAGE_PASSWORDS_FOR_PAGE: 555 case IDC_MANAGE_PASSWORDS_FOR_PAGE:
556 ManagePasswordsForPage(browser_); 556 ManagePasswordsForPage(browser_);
557 break; 557 break;
558 558
559 // Page encoding commands 559 // Page encoding commands
560 case IDC_ENCODING_AUTO_DETECT: 560 case IDC_ENCODING_AUTO_DETECT:
561 browser_->ToggleEncodingAutoDetect(); 561 browser_->ToggleEncodingAutoDetect();
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, fullscreen_enabled); 1270 command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, fullscreen_enabled);
1271 command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE, 1271 command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE,
1272 fullscreen_enabled); 1272 fullscreen_enabled);
1273 1273
1274 UpdateCommandsForBookmarkBar(); 1274 UpdateCommandsForBookmarkBar();
1275 } 1275 }
1276 1276
1277 void BrowserCommandController::UpdatePrintingState() { 1277 void BrowserCommandController::UpdatePrintingState() {
1278 bool print_enabled = CanPrint(browser_); 1278 bool print_enabled = CanPrint(browser_);
1279 command_updater_.UpdateCommandEnabled(IDC_PRINT, print_enabled); 1279 command_updater_.UpdateCommandEnabled(IDC_PRINT, print_enabled);
1280 #if !defined(DISABLE_BASIC_PRINTING) 1280 #if defined(ENABLE_BASIC_PRINTING)
1281 command_updater_.UpdateCommandEnabled(IDC_BASIC_PRINT, 1281 command_updater_.UpdateCommandEnabled(IDC_BASIC_PRINT,
1282 CanBasicPrint(browser_)); 1282 CanBasicPrint(browser_));
1283 #endif // !DISABLE_BASIC_PRINTING 1283 #endif // ENABLE_BASIC_PRINTING
1284 } 1284 }
1285 1285
1286 void BrowserCommandController::UpdateSaveAsState() { 1286 void BrowserCommandController::UpdateSaveAsState() {
1287 command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE, CanSavePage(browser_)); 1287 command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE, CanSavePage(browser_));
1288 } 1288 }
1289 1289
1290 void BrowserCommandController::UpdateShowSyncState(bool show_main_ui) { 1290 void BrowserCommandController::UpdateShowSyncState(bool show_main_ui) {
1291 command_updater_.UpdateCommandEnabled( 1291 command_updater_.UpdateCommandEnabled(
1292 IDC_SHOW_SYNC_SETUP, show_main_ui && pref_signin_allowed_.GetValue()); 1292 IDC_SHOW_SYNC_SETUP, show_main_ui && pref_signin_allowed_.GetValue());
1293 } 1293 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1349 1349
1350 BrowserWindow* BrowserCommandController::window() { 1350 BrowserWindow* BrowserCommandController::window() {
1351 return browser_->window(); 1351 return browser_->window();
1352 } 1352 }
1353 1353
1354 Profile* BrowserCommandController::profile() { 1354 Profile* BrowserCommandController::profile() {
1355 return browser_->profile(); 1355 return browser_->profile();
1356 } 1356 }
1357 1357
1358 } // namespace chrome 1358 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698