Added "Exit full screen" to context menu.

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 288 matching lines @@
     {78, -1, IDC_CONTENT_CONTEXT_OPEN_WITH5},
     {79, -1, IDC_CONTENT_CONTEXT_OPEN_WITH6},
     {80, -1, IDC_CONTENT_CONTEXT_OPEN_WITH7},
     {81, -1, IDC_CONTENT_CONTEXT_OPEN_WITH8},
     {82, -1, IDC_CONTENT_CONTEXT_OPEN_WITH9},
     {83, -1, IDC_CONTENT_CONTEXT_OPEN_WITH10},
     {84, -1, IDC_CONTENT_CONTEXT_OPEN_WITH11},
     {85, -1, IDC_CONTENT_CONTEXT_OPEN_WITH12},
     {86, -1, IDC_CONTENT_CONTEXT_OPEN_WITH13},
     {87, -1, IDC_CONTENT_CONTEXT_OPEN_WITH14},
+    {88, -1, IDC_EXIT_FULLSCREEN},

[sky, 2016/07/07 17:00:41]

Based upon most of these constants starting with IDC_CONTENT_CONTEXT I would
have expected you to go with IDC_CONTENT_CONTEXT_EXIT_FULLSCREEN. Is there a
reason not to?

[Matt Giuca, 2016/07/08 00:55:46]

Done. That's a good point. Also moved the actual value of this constant (in
chrome_command_ids.h so it lives among the other CONTENT_CONTEXT constants).

     // Add new items here and use |enum_id| from the next line.
     // Also, add new items to RenderViewContextMenuItem enum in histograms.xml.
-    {88, -1, 0},  // Must be the last. Increment |enum_id| when new IDC
+    {89, -1, 0},  // Must be the last. Increment |enum_id| when new IDC
                   // was added.
 };
 
 // Collapses large ranges of ids before looking for UMA enum.
 int CollapseCommandsForUMA(int id) {
   DCHECK(!RenderViewContextMenu::IsContentCustomCommandId(id));
   DCHECK(!ContextMenuMatcher::IsExtensionsCustomCommandId(id));
 
   if (id >= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST &&
       id <= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST) {
@@ skipping 553 matching lines @@
     const size_t kMappingSize = arraysize(kUmaEnumToControlId);
     UMA_HISTOGRAM_ENUMERATION("RenderViewContextMenu.Shown", enum_id,
                               kUmaEnumToControlId[kMappingSize - 1].enum_id);
   } else {
     // Just warning here. It's harder to maintain list of all possibly
     // visible items than executable items.
     DLOG(ERROR) << "Update kUmaEnumToControlId. Unhanded IDC: " << id;
   }
 }
 
+bool RenderViewContextMenu::IsHTML5Fullscreen() const {
+  Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_);
+  if (!browser)
+    return false;
+
+  FullscreenController* controller =
+      browser->exclusive_access_manager()->fullscreen_controller();
+  return controller->IsTabFullscreen();
+}
+
 #if defined(ENABLE_PLUGINS)
 void RenderViewContextMenu::HandleAuthorizeAllPlugins() {
   ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
       source_web_contents_, false, std::string());
 }
 #endif
 
 void RenderViewContextMenu::AppendPrintPreviewItems() {
 #if defined(ENABLE_PRINT_PREVIEW)
   if (!print_preview_menu_observer_.get()) {
@@ skipping 266 matching lines @@
     // The "Print" menu item should always be included for plugins. If
     // content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT)
     // is true the item will be added inside AppendPrintItem(). Otherwise we
     // add "Print" here.
     if (!content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT))
       menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   }
 }
 
 void RenderViewContextMenu::AppendPageItems() {
+  AppendExitFullscreenItem();
+
   menu_model_.AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK);
   menu_model_.AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD);
   menu_model_.AddItemWithStringId(IDC_RELOAD, IDS_CONTENT_CONTEXT_RELOAD);
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_SAVE_PAGE,
                                   IDS_CONTENT_CONTEXT_SAVEPAGEAS);
   menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   AppendMediaRouterItem();
 
   if (TranslateService::IsTranslatableURL(params_.page_url)) {
     std::string locale = g_browser_process->GetApplicationLocale();
     locale = translate::TranslateDownloadManager::GetLanguageCode(locale);
     base::string16 language =
         l10n_util::GetDisplayNameForLocale(locale, locale, true);
     menu_model_.AddItem(
         IDC_CONTENT_CONTEXT_TRANSLATE,
         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
     AddGoogleIconToLastMenuItem(&menu_model_);
   }
 }
 
+void RenderViewContextMenu::AppendExitFullscreenItem() {
+  Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_);
+  if (!browser)
+    return;
+
+  // Only show item if in fullscreen mode.
+  if (!browser->exclusive_access_manager()
+           ->fullscreen_controller()
+           ->IsControllerInitiatedFullscreen()) {
+    return;

[sky, 2016/07/07 17:00:41]

I had question about conditionally adding the item, email sent.

[Matt Giuca, 2016/07/08 00:55:46]

Acknowledged.

+  }
+
+  menu_model_.AddItemWithStringId(IDC_EXIT_FULLSCREEN,
+                                  IDS_CONTENT_CONTEXT_EXIT_FULLSCREEN);
+  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+}
+
 void RenderViewContextMenu::AppendCopyItem() {
   if (menu_model_.GetItemCount())
     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPY,
                                   IDS_CONTENT_CONTEXT_COPY);
 }
 
 void RenderViewContextMenu::AppendPrintItem() {
   if (GetPrefs(browser_context_)->GetBoolean(prefs::kPrintingEnabled) &&
       (params_.media_type == WebContextMenuData::MediaTypeNone ||
@@ skipping 370 matching lines @@
     case IDC_SPELLCHECK_MENU:
     case IDC_CONTENT_CONTEXT_OPENLINKWITH:
     case IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_SETTINGS:
     case IDC_CONTENT_CONTEXT_FORCESAVEPASSWORD:
     case IDC_CONTENT_CONTEXT_GENERATEPASSWORD:
       return true;
 
     case IDC_ROUTE_MEDIA:
       return IsRouteMediaEnabled();
 
+    case IDC_EXIT_FULLSCREEN:
+      return true;
+
     default:
       NOTREACHED();
       return false;
   }
 }
 
 bool RenderViewContextMenu::IsCommandIdChecked(int id) const {
   if (RenderViewContextMenuBase::IsCommandIdChecked(id))
     return true;
 
@@ skipping 153 matching lines @@
       break;
 
     case IDC_PRINT:
       ExecPrint();
       break;
 
     case IDC_ROUTE_MEDIA:
       ExecRouteMedia();
       break;
 
+    case IDC_EXIT_FULLSCREEN:
+      ExecExitFullscreen();
+      break;
+
     case IDC_VIEW_SOURCE:
       embedder_web_contents_->ViewSource();
       break;
 
     case IDC_CONTENT_CONTEXT_INSPECTELEMENT:
       ExecInspectElement();
       break;
 
     case IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE:
       ExecInspectBackgroundPage();
@@ skipping 417 matching lines @@
             browser_context_);
     if (params_.media_type == WebContextMenuData::MediaTypeImage &&
         settings && settings->CanUseDataReductionProxy(params_.src_url)) {
       headers = data_reduction_proxy::kDataReductionPassThroughHeader;
     }
 
     source_web_contents_->SaveFrameWithHeaders(url, referrer, headers);
   }
 }
 
+void RenderViewContextMenu::ExecExitFullscreen() {
+  Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_);
+  if (!browser) {
+    NOTREACHED();
+    return;
+  }
+
+  browser->exclusive_access_manager()->ExitExclusiveAccess();
+}
 
 void RenderViewContextMenu::ExecCopyLinkText() {
   ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
   scw.WriteText(params_.link_text);
 }
 
 void RenderViewContextMenu::ExecCopyImageAt() {
   source_web_contents_->GetRenderViewHost()->CopyImageAt(params_.x, params_.y);
 }
 
@@ skipping 185 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);
 }