Fix printing PDFs through right click on Mac and Linux. Looks like they both...

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2010 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 "views/controls/menu/native_menu_win.h"
 
 #include "base/logging.h"
-#include "base/message_loop.h"
 #include "base/stl_util-inl.h"
-#include "base/task.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
@@ skipping 26 matching lines @@
   NativeMenuWin* native_menu_win;
 
   // The index of the item within the menu's model.
   int model_index;
 };
 
 // A window that receives messages from Windows relevant to the native menu
 // structure we have constructed in NativeMenuWin.
 class NativeMenuWin::MenuHostWindow {
  public:
-  MenuHostWindow(NativeMenuWin* parent)
-      : parent_(parent),
-        ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+  MenuHostWindow(NativeMenuWin* parent) : parent_(parent) {
     RegisterClass();
     hwnd_ = CreateWindowEx(l10n_util::GetExtendedStyles(), kWindowClassName,
                            L"", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
     ui::SetWindowUserData(hwnd_, this);
   }
 
   ~MenuHostWindow() {
     DestroyWindow(hwnd_);
   }
 
@@ skipping 170 matching lines @@
       // Draw the separator
       draw_item_struct->rcItem.top +=
           (draw_item_struct->rcItem.bottom - draw_item_struct->rcItem.top) / 3;
       DrawEdge(dc, &draw_item_struct->rcItem, EDGE_ETCHED, BF_TOP);
     }
 
     SetBkColor(dc, prev_bg_color);
     SetTextColor(dc, prev_text_color);
   }
 
-  void OnMenuClosed() {
-    parent_->model_->MenuClosed();
-  }
-
   bool ProcessWindowMessage(HWND window,
                             UINT message,
                             WPARAM w_param,
                             LPARAM l_param,
                             LRESULT* l_result) {
     switch (message) {
       case WM_MENUCOMMAND:
         OnMenuCommand(w_param, reinterpret_cast<HMENU>(l_param));
         *l_result = 0;
         return true;
       case WM_MENUSELECT:
         OnMenuSelect(LOWORD(w_param), reinterpret_cast<HMENU>(l_param));
         *l_result = 0;
         return true;
       case WM_MEASUREITEM:
         OnMeasureItem(w_param, reinterpret_cast<MEASUREITEMSTRUCT*>(l_param));
         *l_result = 0;
         return true;
       case WM_DRAWITEM:
         OnDrawItem(w_param, reinterpret_cast<DRAWITEMSTRUCT*>(l_param));
         *l_result = 0;
         return true;
       case WM_EXITMENULOOP:
-        // WM_MENUCOMMAND comes after this message, but still in the same
-        // callstack.  So use PostTask to guarantee that we'll tell the model
-        // that the menus is closed after any other notifications.
-        MessageLoop::current()->PostTask(
-            FROM_HERE,
-            method_factory_.NewRunnableMethod(&MenuHostWindow::OnMenuClosed));
+        parent_->model_->MenuClosed();
         return true;
       // TODO(beng): bring over owner draw from old menu system.
     }
     return false;
   }
 
   static LRESULT CALLBACK MenuHostWindowProc(HWND window,
                                              UINT message,
                                              WPARAM w_param,
                                              LPARAM l_param) {
     MenuHostWindow* host =
         reinterpret_cast<MenuHostWindow*>(ui::GetWindowUserData(window));
     // host is null during initial construction.
     LRESULT l_result = 0;
     if (!host || !host->ProcessWindowMessage(window, message, w_param, l_param,
                                              &l_result)) {
       return DefWindowProc(window, message, w_param, l_param);
     }
     return l_result;
   }
 
   HWND hwnd_;
   NativeMenuWin* parent_;
-  ScopedRunnableMethodFactory<MenuHostWindow> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuHostWindow);
 };
 
 // static
 const wchar_t* NativeMenuWin::MenuHostWindow::kWindowClassName =
     L"ViewsMenuHostWindow";
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, public:
@@ skipping 327 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views