Remove the Menu object, converting all the remaining callers to use Menu2. I'...

Remove the Menu object, converting all the remaining callers to use Menu2. I'll rename Menu2->Menu afterwards.

TEST=none
BUG=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=18315

[Ben Goodger (Google), 2009-06-11 23:25:37]

Scott, I'm going to unwind the Menu.h removal from this and just checkin the
conversions, then remove menu.h in a future change so I don't need to update
BackForwardMenuModel at the same time. Cna you look at this?

[sky, 2009-06-11 23:48:37]

http://codereview.chromium.org/122027/diff/1/11
File chrome/browser/autocomplete/autocomplete_edit_view_win.cc (right):

http://codereview.chromium.org/122027/diff/1/11#newcode972
Line 972: return command_id == IDS_PASTE_AND_GO &&
!model_->is_paste_and_search();
You need to nuke the !, eg "&& model->..."

http://codereview.chromium.org/122027/diff/1/11#newcode2339
Line 2339: context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL,
IDS_SELECT_ALL);
the old code had a separator between paste and go and select all.

http://codereview.chromium.org/122027/diff/1/22
File chrome/browser/tab_contents/render_view_context_menu_win.h (right):

http://codereview.chromium.org/122027/diff/1/22#newcode53
Line 53: views::SimpleMenuModel* sub_menu_contents_;
If you think this code is going to be around for a bit, could you add a comment
as to what sub_menu_contents_ is.

http://codereview.chromium.org/122027/diff/1/19
File chrome/browser/tab_contents/tab_contents_view_win.h (right):

http://codereview.chromium.org/122027/diff/1/19#newcode105
Line 105: scoped_ptr<RenderViewContextMenuWin> context_menu_;
What calls are async now that this can't be on the stack anymore?

http://codereview.chromium.org/122027/diff/1/3
File views/controls/textfield/native_textfield_win.cc (right):

http://codereview.chromium.org/122027/diff/1/3#newcode845
Line 845: context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
IDS_APP_SELECT_ALL);
nit: line too long

http://codereview.chromium.org/122027/diff/1/4
File views/controls/textfield/native_textfield_win.h (right):

http://codereview.chromium.org/122027/diff/1/4#newcode17
Line 17: #include "views/controls/menu/simple_menu_model.h"
nit: this should be before native_text_field_wrapper.h

[Ben Goodger (Google), 2009-06-12 01:13:50]

Updated. See my email about async.

[sky, 2009-06-12 14:45:13]

http://codereview.chromium.org/122027/diff/1/11
File chrome/browser/autocomplete/autocomplete_edit_view_win.cc (right):

http://codereview.chromium.org/122027/diff/1/11#newcode972
Line 972: return command_id == IDS_PASTE_AND_GO &&
!model_->is_paste_and_search();
On 2009/06/11 23:48:37, sky wrote:
> You need to nuke the !, eg "&& model->..."

Shouldn't this be command_id == IDS_PASTE_AND_GO && model->is_paste_and_search ?

http://codereview.chromium.org/122027/diff/3002/3018
File chrome/browser/views/toolbar_view.cc (left):

http://codereview.chromium.org/122027/diff/3002/3018#oldcode297
Line 297: if (!profiles_menu_)
Isn't this code hit if you turn on a switch?

[Ben Goodger (Google), 2009-06-12 17:27:08]

Actually I don't think you're looking at the latest. This works for me.

On 2009/06/12 14:45:13, sky wrote:
> Isn't this code hit if you turn on a switch?

I couldn't find the code that calls it. I've cleaned up the rest of it.

[sky, 2009-06-12 18:44:53]

LGTM with the following change.

http://codereview.chromium.org/122027/diff/2068/2084
File chrome/browser/views/toolbar_view.cc (right):

http://codereview.chromium.org/122027/diff/2068/2084#newcode175
Line 175: profiles_helper_(new GetProfilesHelper(this)) {
ALLOW_THIS_IN_INITIALIZER_LIST