Fix crash in AppNotifyChannelSetup when incognito profiles are used.

chrome/browser/extensions/extension_tab_helper.cc

 // Copyright (c) 2012 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_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/image/image.h"
 
 using content::WebContents;
 
+namespace {
+
+const char kPermissionError[] = "permission_error";
+const char kIncognitoError[] =

[jstritar, 2012/03/22 20:21:10]

Not sure where I should extract the two copies of this string. Maybe the
extension_misc section of extension_constants.h?

[asargent_no_longer_on_chrome, 2012/03/22 20:58:11]

Sure, putting it in extension_constants.h seems fine to me. 

[jstritar, 2012/03/23 15:31:43]

Done.

+    "This API is not accessible by 'split' mode "
+    "extensions in incognito windows.";
+
+}  // namespace
+
 ExtensionTabHelper::ExtensionTabHelper(TabContentsWrapper* wrapper)
     : content::WebContentsObserver(wrapper->web_contents()),
       delegate_(NULL),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(wrapper->profile(), this)),
       wrapper_(wrapper) {
 }
 
 ExtensionTabHelper::~ExtensionTabHelper() {
@@ skipping 132 matching lines @@
 
   // Check for permission first.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* extension_service = profile->GetExtensionService();
   extensions::ProcessMap* process_map = extension_service->process_map();
   content::RenderProcessHost* process =
       tab_contents_wrapper()->web_contents()->GetRenderProcessHost();
   const Extension* extension =
       extension_service->GetInstalledApp(requestor_url);
-  bool allowed =
-      extension &&
-      extension->HasAPIPermission(
-          ExtensionAPIPermission::kAppNotifications) &&
-      process_map->Contains(extension->id(), process->GetID());
-  if (!allowed) {
+
+  std::string error;
+  if (!extension ||
+      !extension->HasAPIPermission(
+          ExtensionAPIPermission::kAppNotifications) ||
+      !process_map->Contains(extension->id(), process->GetID()))
+    error = kPermissionError;
+
+  // Make sure the extension can cross to the main profile, if called from an
+  // an incognito window.
+  if (profile->IsOffTheRecord() &&
+      !extension_service->CanCrossIncognito(extension))
+    error = kIncognitoError;
+
+  if (!error.empty()) {
     Send(new ExtensionMsg_GetAppNotifyChannelResponse(
-        return_route_id, "", "permission_error", callback_id));
+        return_route_id, "", error, callback_id));
     return;
   }
 
   AppNotifyChannelUI* ui = new AppNotifyChannelUIImpl(
       GetBrowser(), tab_contents_wrapper(), extension->name());
 
   scoped_refptr<AppNotifyChannelSetup> channel_setup(
       new AppNotifyChannelSetup(profile,
                                 extension->id(),
                                 client_id,
@@ skipping 99 matching lines @@
 void ExtensionTabHelper::OnInlineInstallFailure(int install_id,
                                                 int return_route_id,
                                                 const std::string& error) {
   Send(new ExtensionMsg_InlineWebstoreInstallResponse(
       return_route_id, install_id, false, error));
 }
 
 WebContents* ExtensionTabHelper::GetAssociatedWebContents() const {
   return web_contents();
 }