Adding menu item to take screenshot

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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/ui/views/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 775 matching lines @@
 
 // WrenchMenu ------------------------------------------------------------------
 
 WrenchMenu::WrenchMenu(Browser* browser, int run_flags)
     : root_(NULL),
       browser_(browser),
       selected_menu_model_(NULL),
       selected_index_(0),
       bookmark_menu_(NULL),
       feedback_menu_item_(NULL),
+      screenshot_menu_item_(NULL),

[sky, 2015/02/04 17:06:01]

nullptr

[caelyn, 2015/02/04 20:30:12]

changing all of these to nullptr while I am here. (I followed the pattern of the
other items in case there was some reason we were using NULL instead of
nullptr).

       run_flags_(run_flags) {
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(browser_->profile()));
 }
 
 WrenchMenu::~WrenchMenu() {
   if (bookmark_menu_delegate_.get()) {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(
         browser_->profile());
     if (model)
@@ skipping 240 matching lines @@
   return true;
 }
 
 void WrenchMenu::WillShowMenu(MenuItemView* menu) {
   if (menu == bookmark_menu_)
     CreateBookmarkMenu();
 }
 
 void WrenchMenu::WillHideMenu(MenuItemView* menu) {
   // Turns off the fade out animation of the wrench menus if
-  // |feedback_menu_item_| is selected.  This excludes the wrench menu itself
-  // from the snapshot in the feedback UI.
-  if (menu->HasSubmenu() && feedback_menu_item_ &&
-      feedback_menu_item_->IsSelected()) {
+  // |feedback_menu_item_| or |screenshot_menu_item_| is selected.  This
+  // excludes the wrench menu itself from the screenshot.
+  if (menu->HasSubmenu() &&
+      ((feedback_menu_item_ && feedback_menu_item_->IsSelected()) ||
+       (screenshot_menu_item_ && screenshot_menu_item_->IsSelected()))) {
     // It's okay to just turn off the animation and no to take care the
     // animation back because the menu widget will be recreated next time
     // it's opened. See ToolbarView::RunMenu() and Init() of this class.
     menu->GetSubmenu()->GetWidget()->
         SetVisibilityChangedAnimationsEnabled(false);
   }
 }
 
 bool WrenchMenu::ShouldCloseOnDragComplete() {
   return false;
@@ skipping 84 matching lines @@
         bookmark_menu_ = item;
         break;
 
 #if defined(GOOGLE_CHROME_BUILD)
       case IDC_FEEDBACK:
         DCHECK(!feedback_menu_item_);
         feedback_menu_item_ = item;
         break;
 #endif
 
+#if defined(OS_CHROMEOS)
+      case IDC_TAKE_SCREENSHOT:
+        DCHECK(!screenshot_menu_item_);
+        screenshot_menu_item_ = item;
+        break;
+#endif
+
       case IDC_RECENT_TABS_MENU:
         DCHECK(!recent_tabs_menu_model_delegate_.get());
         recent_tabs_menu_model_delegate_.reset(
             new RecentTabsMenuModelDelegate(this, model->GetSubmenuModelAt(i),
                                             item));
         break;
 
       default:
         break;
     }
@@ skipping 72 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }