Fix some UI issues with omnibox extensions in incognito.

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 150 matching lines @@
     return;
 
   // We don't expect to get events from a completely different profile.
   DCHECK(!restrict_to_profile || profile_->IsSameProfile(restrict_to_profile));
 
   ListenerMap::iterator it = listeners_.find(event_name);
   if (it == listeners_.end())
     return;
 
   std::set<EventListener>& listeners = it->second;
+  ExtensionsService* service = profile_->GetExtensionsService();
 
   // Send the event only to renderers that are listening for it.
   for (std::set<EventListener>::iterator listener = listeners.begin();
        listener != listeners.end(); ++listener) {
     if (!ChildProcessSecurityPolicy::GetInstance()->
             HasExtensionBindings(listener->process->id())) {
       // Don't send browser-level events to unprivileged processes.
       continue;
     }
 
     if (!extension_id.empty() && extension_id != listener->extension_id)
       continue;
 
     // Is this event from a different profile than the renderer (ie, an
     // incognito tab event sent to a normal process, or vice versa).
     bool cross_incognito = restrict_to_profile &&
         listener->process->profile() != restrict_to_profile;
-    if (cross_incognito && !CanCrossIncognito(profile_, listener->extension_id))
+    const Extension* extension = service->GetExtensionById(
+        listener->extension_id, false);
+    if (cross_incognito && !service->CanCrossIncognito(extension))
       continue;
 
     DispatchEvent(listener->process, listener->extension_id,
                   event_name, event_args, event_url);
   }
 }
 
 void ExtensionEventRouter::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
@@ skipping 15 matching lines @@
           }
         }
       }
       break;
     }
     default:
       NOTREACHED();
       return;
   }
 }