Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc

Issue 2544853002: Merge "kiosk: Use ContextMenuContentTypeAppMode when in app mode" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 057e015f0b7264cd44fec2de861de243395dcaf6..08841616efd1b359b0a5ea28ecd123ddade7ad50 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
@@ -59,12 +59,12 @@ ContextMenuContentType* ContextMenuContentTypeFactory::CreateInternal(
content::WebContents* web_contents,
const content::ContextMenuParams& params) {
#if BUILDFLAG(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 ||
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698