PrintPreview: Make ctrl-shift-p start the native print flow.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 39 matching lines @@
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
 #include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
+#include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
@@ skipping 1680 matching lines @@
   platform_util::OpenExternal(GURL(mailto));
 }
 
 void Browser::Print() {
   if (switches::IsPrintPreviewEnabled())
     GetSelectedTabContentsWrapper()->print_view_manager()->PrintPreviewNow();
   else
     GetSelectedTabContentsWrapper()->print_view_manager()->PrintNow();
 }
 
+void Browser::AdvancedPrint() {
+  GetSelectedTabContentsWrapper()->print_view_manager()->AdvancedPrintNow();
+}
+
 void Browser::ToggleEncodingAutoDetect() {
   UserMetrics::RecordAction(UserMetricsAction("AutoDetectChange"));
   encoding_auto_detect_.SetValue(!encoding_auto_detect_.GetValue());
   // If "auto detect" is turned on, then any current override encoding
   // is cleared. This also implicitly performs a reload.
   // OTOH, if "auto detect" is turned off, we don't change the currently
   // active encoding.
   if (encoding_auto_detect_.GetValue()) {
     TabContents* contents = GetSelectedTabContents();
     if (contents)
@@ skipping 653 matching lines @@
     case IDC_SHOW_KEYBOARD_OVERLAY: ShowKeyboardOverlay();            break;
 #endif
 
     // Page-related commands
     case IDC_SAVE_PAGE:             SavePage();                       break;
     case IDC_BOOKMARK_PAGE:         BookmarkCurrentPage();            break;
     case IDC_BOOKMARK_ALL_TABS:     BookmarkAllTabs();                break;
     case IDC_VIEW_SOURCE:           ViewSelectedSource();             break;
     case IDC_EMAIL_PAGE_LOCATION:   EmailPageLocation();              break;
     case IDC_PRINT:                 Print();                          break;
+    case IDC_ADVANCED_PRINT:        AdvancedPrint();                  break;
     case IDC_ENCODING_AUTO_DETECT:  ToggleEncodingAutoDetect();       break;
     case IDC_ENCODING_UTF8:
     case IDC_ENCODING_UTF16LE:
     case IDC_ENCODING_ISO88591:
     case IDC_ENCODING_WINDOWS1252:
     case IDC_ENCODING_GBK:
     case IDC_ENCODING_GB18030:
     case IDC_ENCODING_BIG5HKSCS:
     case IDC_ENCODING_BIG5:
     case IDC_ENCODING_KOREAN:
@@ skipping 1709 matching lines @@
   command_updater_.UpdateCommandEnabled(
       IDC_CUT, !(restrictions & CONTENT_RESTRICTION_CUT));
   command_updater_.UpdateCommandEnabled(
       IDC_PASTE, !(restrictions & CONTENT_RESTRICTION_PASTE));
   UpdateSaveAsState(restrictions);
   UpdatePrintingState(restrictions);
 }
 
 void Browser::UpdatePrintingState(int content_restrictions) {
   bool enabled = true;
+  bool is_preview_tab = true;

[Lei Zhang, 2011/08/25 09:05:49]

This variable is poorly named. It's true in some cases even if the tab isn't a
print preview tab.

[kmadhusu, 2011/08/25 17:51:48]

Fixed...

   if (content_restrictions & CONTENT_RESTRICTION_PRINT) {
     enabled = false;
+    is_preview_tab = printing::PrintPreviewTabController::IsPrintPreviewTab(
+        GetSelectedTabContents());
   } else if (g_browser_process->local_state()) {
     enabled = g_browser_process->local_state()->
         GetBoolean(prefs::kPrintingEnabled);
   }
   command_updater_.UpdateCommandEnabled(IDC_PRINT, enabled);
+  command_updater_.UpdateCommandEnabled(IDC_ADVANCED_PRINT,
+                                        is_preview_tab ? true : enabled);
 }
 
 void Browser::UpdateReloadStopState(bool is_loading, bool force) {
   window_->UpdateReloadStopState(is_loading, force);
   command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading);
 }
 
 void Browser::UpdateCommandsForDevTools() {
   bool dev_tools_enabled =
       !profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
@@ skipping 706 matching lines @@
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }