views: Split DownloadShelfContextMenuWin out to its own header file.

chrome/browser/ui/views/download/download_item_view.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/views/download/download_item_view.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
-#include "chrome/browser/download/download_shelf_context_menu.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image.h"
 #include "unicode/uchar.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
-#include "views/controls/menu/menu_2.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 // TODO(paulg): These may need to be adjusted when download progress
 //              animation is added, and also possibly to take into account
 //              different screen resolutions.
 static const int kTextWidth = 140;            // Pixels
 static const int kDangerousTextWidth = 200;   // Pixels
 static const int kHorizontalTextPadding = 2;  // Pixels
 static const int kVerticalPadding = 3;        // Pixels
@@ skipping 25 matching lines @@
 
 // How long we keep the item disabled after the user clicked it to open the
 // downloaded item.
 static const int kDisabledOnOpenDuration = 3000;
 
 // Darken light-on-dark download status text by 20% before drawing, thus
 // creating a "muted" version of title text for both dark-on-light and
 // light-on-dark themes.
 static const double kDownloadItemLuminanceMod = 0.8;
 
-// DownloadShelfContextMenuWin -------------------------------------------------
-
-class DownloadShelfContextMenuWin : public DownloadShelfContextMenu {
- public:
-  explicit DownloadShelfContextMenuWin(BaseDownloadItemModel* model)
-      : DownloadShelfContextMenu(model) {
-    DCHECK(model);
-  }
-
-  void Run(const gfx::Point& point) {
-    if (download_item()->IsComplete())
-      menu_.reset(new views::Menu2(GetFinishedMenuModel()));
-    else
-      menu_.reset(new views::Menu2(GetInProgressMenuModel()));
-
-    // The menu's alignment is determined based on the UI layout.
-    views::Menu2::Alignment alignment;
-    if (base::i18n::IsRTL())
-      alignment = views::Menu2::ALIGN_TOPRIGHT;
-    else
-      alignment = views::Menu2::ALIGN_TOPLEFT;
-    menu_->RunMenuAt(point, alignment);
-  }
-
-  // This method runs when the caller has been deleted and we should not attempt
-  // to access |download_|.
-  void Stop() {
-    set_download_item(NULL);
-  }
-
- private:
-  scoped_ptr<views::Menu2> menu_;
-};
-
 // DownloadItemView ------------------------------------------------------------

[asanka, 2011/05/20 21:45:16]

Nit: Don't need a section here.

[tfarina, 2011/05/20 22:19:23]

Done.

 
 DownloadItemView::DownloadItemView(DownloadItem* download,
     DownloadShelfView* parent,
     BaseDownloadItemModel* model)
   : warning_icon_(NULL),
     download_(download),
     parent_(parent),
     status_text_(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING))),
     show_status_text_(true),
@@ skipping 526 matching lines @@
     point.set_y(height());
     if (base::i18n::IsRTL())
       point.set_x(drop_down_x_right_);
     else
       point.set_x(drop_down_x_left_);
   }
 
   views::View::ConvertPointToScreen(this, &point);
 
   if (!context_menu_.get())
-    context_menu_.reset(new DownloadShelfContextMenuWin(model_.get()));
+    context_menu_.reset(new DownloadShelfContextMenuView(model_.get()));
   // When we call the Run method on the menu, it runs an inner message loop
   // that might causes us to be deleted.
   bool deleted = false;
   deleted_ = &deleted;
   context_menu_->Run(point);
   if (deleted)
     return;  // We have been deleted! Don't access 'this'.
   deleted_ = NULL;
 
   // If the menu action was to remove the download, this view will also be
@@ skipping 474 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }