Fixed memory leak. Untangled confusing code with menu initialization and ownership.

chrome/browser/ui/views/reload_button.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 "chrome/browser/ui/views/reload_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/event_disposition.h"
@@ skipping 21 matching lines @@
   IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM,
   IDS_RELOAD_MENU_HARD_RELOAD_ITEM,
   IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM,
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, public:
 
 ReloadButton::ReloadButton(LocationBarView* location_bar,
                            CommandUpdater* command_updater)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(ButtonDropDown(this, CreateMenuModel())),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(ButtonDropDown(this, NULL)),
       location_bar_(location_bar),
       command_updater_(command_updater),
       intended_mode_(MODE_RELOAD),
       visible_mode_(MODE_RELOAD),
       double_click_timer_delay_(
           base::TimeDelta::FromMilliseconds(views::GetDoubleClickInterval())),
       stop_to_reload_timer_delay_(base::TimeDelta::FromMilliseconds(1350)),
       menu_enabled_(false),
       testing_mouse_hovered_(false),
       testing_reload_count_(0) {
+  menu_model_.reset(new ui::SimpleMenuModel(this));
+  for (size_t i = 0; i < arraysize(kReloadMenuItems); i++) {
+    menu_model_->AddItemWithStringId(kReloadMenuItems[i],
+                                     kReloadMenuItems[i]);
+  }
+  ButtonDropDown::set_menu_model(menu_model_.get());
 }
 
 ReloadButton::~ReloadButton() {
+  ButtonDropDown::set_menu_model(NULL);

[Peter Kasting, 2012/08/07 19:43:03]

This doesn't seem necessary.

[gene, 2012/08/07 20:58:34]

You are right, it does not now.
However ButtonDropDown menu destructor is called after ReloadButton destructor.
Here I wanted to make sure ~ButtonDropDown does not have invalid pointer.

 }
 
 void ReloadButton::ChangeMode(Mode mode, bool force) {
   intended_mode_ = mode;
 
   // If the change is forced, or the user isn't hovering the icon, or it's safe
   // to change it to the other image type, make the change immediately;
   // otherwise we'll let it happen later.
   if (force || (!IsMouseHovered() && !testing_mouse_hovered_) ||
       ((mode == MODE_STOP) ?
@@ skipping 159 matching lines @@
       break;
     default:
       NOTREACHED();
   }
   ExecuteBrowserCommand(browser_command, event_flags);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, private:
 
-ui::SimpleMenuModel* ReloadButton::CreateMenuModel() {
-  ui::SimpleMenuModel* menu_model_ = new ui::SimpleMenuModel(this);
-  for (size_t i = 0; i < arraysize(kReloadMenuItems); i++) {
-    menu_model_->AddItemWithStringId(kReloadMenuItems[i],
-                                     kReloadMenuItems[i]);
-  }
-  return menu_model_;
-}
-
 void ReloadButton::ExecuteBrowserCommand(int command, int event_flags) {
   if (!command_updater_)
     return;
 
   WindowOpenDisposition disposition =
       chrome::DispositionFromEventFlags(event_flags);
   if ((disposition == CURRENT_TAB) && location_bar_) {
     // Forcibly reset the location bar, since otherwise it won't discard any
     // ongoing user edits, since it doesn't realize this is a user-initiated
     // action.
@@ skipping 14 matching lines @@
 
 void ReloadButton::OnDoubleClickTimer() {
   if (!IsMenuShowing())
     ChangeMode(intended_mode_, false);
 }
 
 void ReloadButton::OnStopToReloadTimer() {
   DCHECK(!IsMenuShowing());
   ChangeMode(intended_mode_, true);
 }