Restore context menus to hosted app sites.

chrome/browser/tab_contents/render_view_context_menu.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 <algorithm>
 #include <set>
 #include <utility>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
@@ skipping 35 matching lines @@
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_view_type.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_save_info.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 451 matching lines @@
   for (i = sorted_ids.begin();
        i != sorted_ids.end(); ++i) {
     AppendExtensionItems(i->second, &index);
   }
   UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime",
                       base::TimeTicks::Now() - begin);
   UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index);
 }
 
 void RenderViewContextMenu::InitMenu() {
-  const Extension* extension = GetExtension();
-  if (extension) {
-    if (extension->is_platform_app())
-      AppendPlatformAppItems(extension);
-    else
-      AppendPopupExtensionItems();
+  content::ViewType view_type = source_web_contents_->GetViewType();
+  if (view_type == chrome::VIEW_TYPE_APP_SHELL) {
+    AppendPlatformAppItems();
+    return;
+  } else if (view_type == chrome::VIEW_TYPE_EXTENSION_POPUP) {
+    AppendPopupExtensionItems();
     return;
   }
 
   bool has_link = !params_.unfiltered_link_url.is_empty();
   bool has_selection = !params_.selection_text.empty();
 
   if (AppendCustomItems()) {
     // If there's a selection, don't early return when there are custom items,
     // but fall through to adding the normal ones after the custom ones.
     if (has_selection) {
@@ skipping 82 matching lines @@
 const Extension* RenderViewContextMenu::GetExtension() const {
   ExtensionSystem* system = ExtensionSystem::Get(profile_);
   // There is no process manager in some tests.
   if (!system->process_manager())
     return NULL;
 
   return system->process_manager()->GetExtensionForRenderViewHost(
       source_web_contents_->GetRenderViewHost());
 }
 
-void RenderViewContextMenu::AppendPlatformAppItems(
-    const Extension* platform_app) {
+void RenderViewContextMenu::AppendPlatformAppItems() {
+  const Extension* platform_app = GetExtension();
   DCHECK(platform_app);
+  DCHECK(platform_app->is_platform_app());
+
   int index = 0;
   AppendExtensionItems(platform_app->id(), &index);
 
   // Add dev tools for unpacked extensions.
   if (platform_app->location() == Extension::LOAD) {
     menu_model_.AddItemWithStringId(IDC_RELOAD, IDS_CONTENT_CONTEXT_RELOAD);
     AppendDeveloperItems();
   }
 }
 
@@ skipping 1243 matching lines @@
   if (view)
     view->SetShowingContextMenu(false);
   RenderViewHost* rvh = source_web_contents_->GetRenderViewHost();
   if (rvh) {
     rvh->NotifyContextMenuClosed(params_.custom_context);
   }
 }
 
 bool RenderViewContextMenu::IsDevCommandEnabled(int id) const {
   if (id == IDC_CONTENT_CONTEXT_INSPECTELEMENT) {
-    // Don't enable the web inspector if JavaScript is disabled. We don't

[benwells, 2012/04/28 01:26:06]

This check was bypassed for popups and shell windows back when a
TabContentsWrapper was used to get the preferences. As at r126602 this no longer
happens so we can just remove the special case.

-    // check this when this is the web contents of an extension (e.g.
-    // for a popup extension or a platform app) as they have JavaScript
-    // always enabled.
-    const Extension* extension = GetExtension();
-    if (!extension) {
-      const CommandLine* command_line = CommandLine::ForCurrentProcess();
-      if (!profile_->GetPrefs()->GetBoolean(
-          prefs::kWebKitGlobalJavascriptEnabled) ||
-          command_line->HasSwitch(switches::kDisableJavaScript))
-        return false;
-    }
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (!profile_->GetPrefs()->GetBoolean(
+        prefs::kWebKitGlobalJavascriptEnabled) ||
+        command_line->HasSwitch(switches::kDisableJavaScript))
+      return false;
 
     // Don't enable the web inspector if the developer tools are disabled via
     // the preference dev-tools-disabled.
     if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
       return false;
   }
 
   return true;
 }
 
@@ skipping 50 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }