Fixing a regression introduced with r69101, which now prevents Chrome Frame...

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_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
 
 // A class to implement common functionality for all types of
 // plugins: NPAPI. ActiveX and ActiveDoc
 template <typename T>
-class ChromeFramePlugin : public ChromeFrameDelegateImpl {
+class ChromeFramePlugin
+    : public ChromeFrameDelegateImpl,
+      public NavigationConstraintsImpl  {
  public:
-  ChromeFramePlugin()
-      : ignore_setfocus_(false),
-        is_privileged_(false) {
+  ChromeFramePlugin() : ignore_setfocus_(false){
   }
   ~ChromeFramePlugin() {
     Uninitialize();
   }
 
 BEGIN_MSG_MAP(T)
   MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus)
   MESSAGE_HANDLER(WM_SIZE, OnSize)
   MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify)
 END_MSG_MAP()
@@ skipping 20 matching lines @@
 
   bool InitializeAutomation(const std::wstring& profile_name,
                             const std::wstring& extra_chrome_arguments,
                             bool incognito, bool is_widget_mode,
                             const GURL& url, const GURL& referrer,
                             bool route_all_top_level_navigations) {
     DCHECK(IsValid());
     DCHECK(launch_params_ == NULL);
     // We don't want to do incognito when privileged, since we're
     // running in browser chrome or some other privileged context.
-    bool incognito_mode = !is_privileged_ && incognito;
+    bool incognito_mode = !is_privileged() && incognito;
     FilePath profile_path;
     GetProfilePath(profile_name, &profile_path);
     // The profile name could change based on the browser version. For e.g. for
     // IE6/7 the profile is created in a different folder whose last component
     // is Google Chrome Frame.
     FilePath actual_profile_name = profile_path.BaseName();
     launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path,
         actual_profile_name.value(), SimpleResourceLoader::GetLanguage(),
         extra_chrome_arguments, incognito_mode, is_widget_mode,
         route_all_top_level_navigations);
@@ skipping 11 matching lines @@
         (static_cast<T*>(this))->GetClientRect(bounds);
       }
     }
   }
   virtual std::string GetDocumentUrl() {
     return document_url_;
   }
   virtual void OnAutomationServerReady() {
     // Issue the extension automation request if we're privileged to
     // allow this control to handle extension requests from Chrome.
-    if (is_privileged_ && IsValid())
+    if (is_privileged() && IsValid())
       automation_client_->SetEnableExtensionAutomation(functions_enabled_);
   }
 
   virtual bool IsValid() const {
     return automation_client_.get() != NULL;
   }
 
   virtual void OnHostMoved() {
     if (IsValid())
       automation_client_->OnChromeFrameHostMoved();
@@ skipping 141 matching lines @@
   scoped_refptr<ChromeFrameLaunchParams> launch_params_;
 
   // Url of the containing document.
   std::string document_url_;
 
   // We set this flag when we're taking the focus ourselves
   // and notifying the host browser that we're doing so.
   // When the flag is not set, we transfer the focus to chrome.
   bool ignore_setfocus_;
 
-  // The plugin is privileged if it is:
-  // * Invoked by a window running under the system principal in FireFox.
-  // * Being hosted by a custom host exposing the SID_ChromeFramePrivileged
-  //   service.
-  //
-  // When privileged, additional interfaces are made available to the user.
-  bool is_privileged_;
-
   // 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_
-