Revert 233460 "Prefer opening PDF downloads in the browser."

trunk/src/chrome/browser/download/download_item_model.cc

 // Copyright (c) 2012 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/download/download_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
 #include "base/time/time.h"
-#include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_crx_util.h"
-#include "chrome/browser/download/download_service.h"
-#include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/safe_browsing/download_feedback_service.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/text_elider.h"
@@ skipping 19 matching lines @@
   bool should_show_in_shelf() const { return should_show_in_shelf_; }
   void set_should_show_in_shelf(bool should_show_in_shelf) {
     should_show_in_shelf_ = should_show_in_shelf;
   }
 
   bool should_notify_ui() const { return should_notify_ui_; }
   void set_should_notify_ui(bool should_notify_ui) {
     should_notify_ui_ = should_notify_ui;
   }
 
-  bool should_prefer_opening_in_browser() const {
-    return should_prefer_opening_in_browser_;
-  }
-  void set_should_prefer_opening_in_browser(bool preference) {
-    should_prefer_opening_in_browser_ = preference;
-  }
-
  private:
   DownloadItemModelData();
   virtual ~DownloadItemModelData() {}
 
   static const char kKey[];
 
   // Whether the download should be displayed in the download shelf. True by
   // default.
   bool should_show_in_shelf_;
 
   // Whether the UI should be notified when the download is ready to be
   // presented.
   bool should_notify_ui_;
-
-  // Whether the download should be opened in the browser vs. the system handler
-  // for the file type.
-  bool should_prefer_opening_in_browser_;
 };
 
 // static
 const char DownloadItemModelData::kKey[] = "DownloadItemModelData key";
 
 // static
 const DownloadItemModelData* DownloadItemModelData::Get(
     const DownloadItem* download) {
   return static_cast<const DownloadItemModelData*>(download->GetUserData(kKey));
 }
 
 // static
 DownloadItemModelData* DownloadItemModelData::GetOrCreate(
     DownloadItem* download) {
   DownloadItemModelData* data =
       static_cast<DownloadItemModelData*>(download->GetUserData(kKey));
   if (data == NULL) {
     data = new DownloadItemModelData();
     download->SetUserData(kKey, data);
   }
   return data;
 }
 
 DownloadItemModelData::DownloadItemModelData()
     : should_show_in_shelf_(true),
-      should_notify_ui_(false),
-      should_prefer_opening_in_browser_(false) {
+      should_notify_ui_(false) {
 }
 
 string16 InterruptReasonStatusMessage(int reason) {
   int string_id = 0;
 
   switch (reason) {
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_ACCESS_DENIED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE:
@@ skipping 421 matching lines @@
 bool DownloadItemModel::ShouldNotifyUI() const {
   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
   return data && data->should_notify_ui();
 }
 
 void DownloadItemModel::SetShouldNotifyUI(bool should_notify) {
   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
   data->set_should_notify_ui(should_notify);
 }
 
-bool DownloadItemModel::ShouldPreferOpeningInBrowser() const {
-  const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
-  return data && data->should_prefer_opening_in_browser();
-}
-
-void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
-  DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
-  data->set_should_prefer_opening_in_browser(preference);
-}
-
 string16 DownloadItemModel::GetProgressSizesString() const {
   string16 size_ratio;
   int64 size = GetCompletedBytes();
   int64 total = GetTotalBytes();
   if (total > 0) {
     ui::DataUnits amount_units = ui::GetByteDisplayUnits(total);
     string16 simple_size = ui::FormatBytesWithUnits(size, amount_units, false);
 
     // In RTL locales, we render the text "size/total" in an RTL context. This
     // is problematic since a string such as "123/456 MB" is displayed
@@ skipping 53 matching lines @@
   }
 
   // In progress download with no known time left and non-zero completed bytes:
   // "100/120 MB" or "100 MB"
   if (GetCompletedBytes() > 0)
     return size_ratio;
 
   // Instead of displaying "0 B" we say "Starting..."
   return l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING);
 }
-
-void DownloadItemModel::OpenUsingPlatformHandler() {
-  DownloadService* download_service =
-      DownloadServiceFactory::GetForBrowserContext(
-          download_->GetBrowserContext());
-  if (!download_service)
-    return;
-
-  ChromeDownloadManagerDelegate* delegate =
-      download_service->GetDownloadManagerDelegate();
-  if (!delegate)
-    return;
-  delegate->OpenDownloadUsingPlatformHandler(download_);
-  RecordDownloadOpenMethod(DOWNLOAD_OPEN_METHOD_USER_PLATFORM);
-}