Merge "kiosk: Use ContextMenuContentTypeAppMode when in app mode"

chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc

Index: chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
index 351ff01692604e2b173de7df1de75ccffa27abf5..4f7ef7e5a652a04ea29d23035d45ea2b1a9a86cf 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
@@ -58,12 +58,12 @@ ContextMenuContentType* ContextMenuContentTypeFactory::CreateInternal(
     content::WebContents* web_contents,
     const content::ContextMenuParams& params) {
 #if defined(ENABLE_EXTENSIONS)
-  if (extensions::WebViewGuest::FromWebContents(web_contents))
-    return new ContextMenuContentTypeWebView(web_contents, params);
-
   if (chrome::IsRunningInForcedAppMode())
     return new ContextMenuContentTypeAppMode(web_contents, params);
 
+  if (extensions::WebViewGuest::FromWebContents(web_contents))
+    return new ContextMenuContentTypeWebView(web_contents, params);
+
   const extensions::ViewType view_type = extensions::GetViewType(web_contents);
 
   if (view_type == extensions::VIEW_TYPE_APP_WINDOW ||