Fix bug with context menus in incognito mode.

chrome/browser/extensions/extension_event_router.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 "chrome/browser/extensions/extension_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_processes_api.h"
@@ skipping 15 matching lines @@
                           const std::string& event_name,
                           const std::string& event_args,
                           const GURL& event_url) {
   ListValue args;
   args.Set(0, Value::CreateStringValue(event_name));
   args.Set(1, Value::CreateStringValue(event_args));
   renderer->Send(new ViewMsg_ExtensionMessageInvoke(MSG_ROUTING_CONTROL,
       extension_id, kDispatchEvent, args, event_url));
 }
 
-static bool CanCrossIncognito(Profile* profile,
-                              const std::string& extension_id) {
-  // We allow the extension to see events and data from another profile iff it
-  // uses "spanning" behavior and it has incognito access. "split" mode
-  // extensions only see events for a matching profile.
-  const Extension* extension =
-      profile->GetExtensionsService()->GetExtensionById(extension_id, false);
-  return (profile->GetExtensionsService()->IsIncognitoEnabled(extension) &&
-          !extension->incognito_split_mode());
-}
-
 }  // namespace
 
 struct ExtensionEventRouter::EventListener {
   RenderProcessHost* process;
   std::string extension_id;
 
   explicit EventListener(RenderProcessHost* process,
                          const std::string& extension_id)
       : process(process), extension_id(extension_id) {}
 
   bool operator<(const EventListener& that) const {
     if (process < that.process)
       return true;
     if (process == that.process && extension_id < that.extension_id)
       return true;
     return false;
   }
 };
 
+// static
+bool ExtensionEventRouter::CanCrossIncognito(Profile* profile,
+                                             const std::string& extension_id) {
+  const Extension* extension =
+      profile->GetExtensionsService()->GetExtensionById(extension_id, false);
+  return CanCrossIncognito(profile, extension);
+}
+
+// static
+bool ExtensionEventRouter::CanCrossIncognito(Profile* profile,
+                                             const Extension* extension) {
+  // We allow the extension to see events and data from another profile iff it
+  // uses "spanning" behavior and it has incognito access. "split" mode
+  // extensions only see events for a matching profile.
+  return (profile->GetExtensionsService()->IsIncognitoEnabled(extension) &&
+          !extension->incognito_split_mode());
+}
+
 ExtensionEventRouter::ExtensionEventRouter(Profile* profile)
     : profile_(profile),
       extension_devtools_manager_(profile->GetExtensionDevToolsManager()) {
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
 }
 
 ExtensionEventRouter::~ExtensionEventRouter() {
@@ skipping 131 matching lines @@
           }
         }
       }
       break;
     }
     default:
       NOTREACHED();
       return;
   }
 }