Remove includes of message headers in headers.

chrome_frame/chrome_frame_plugin.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/win/win_util.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/simple_resource_loader.h"
 #include "chrome_frame/navigation_constraints.h"
 #include "chrome_frame/utils.h"
 #include "grit/chromium_strings.h"
 
 #define IDC_ABOUT_CHROME_FRAME 40018
 
+// Helper so that this file doesn't include the messages header.
+void ChromeFramePluginGetParamsCoordinates(
+    const MiniContextMenuParams& params,
+    int* x,
+    int* y);
+
 // A class to implement common functionality for all types of
 // plugins: NPAPI. ActiveX and ActiveDoc
 template <typename T>
 class ChromeFramePlugin
     : public ChromeFrameDelegateImpl,
       public NavigationConstraintsImpl  {
  public:
   ChromeFramePlugin() : ignore_setfocus_(false){
   }
   ~ChromeFramePlugin() {
@@ skipping 101 matching lines @@
       return;
 
     T* self = static_cast<T*>(this);
     if (self->PreProcessContextMenu(copy)) {
       // In order for the context menu to handle keyboard input, give the
       // ActiveX window focus.
       ignore_setfocus_ = true;
       SetFocus(GetWindow());
       ignore_setfocus_ = false;
       UINT flags = align_flags | TPM_LEFTBUTTON | TPM_RETURNCMD | TPM_RECURSE;
-      UINT selected = TrackPopupMenuEx(copy, flags, params.screen_x,
-                                       params.screen_y, GetWindow(), NULL);
+      int x, y;
+      ChromeFramePluginGetParamsCoordinates(params, &x, &y);
+      UINT selected = TrackPopupMenuEx(copy, flags, x, y, GetWindow(), NULL);
       // Menu is over now give focus back to chrome
       GiveFocusToChrome(false);
       if (IsValid() && selected != 0 &&
           !self->HandleContextMenuCommand(selected, params)) {
         automation_client_->SendContextMenuCommandToChromeFrame(selected);
       }
     }
 
     DestroyMenu(copy);
   }
@@ skipping 106 matching lines @@
   bool ignore_setfocus_;
 
   // List of functions to enable for automation, or a single entry "*" to
   // enable all functions for automation.  Ignored unless is_privileged_ is
   // true.  Defaults to the empty list, meaning automation will not be
   // turned on.
   std::vector<std::string> functions_enabled_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_