Make NetworkMenuModel a ui::MenuModel again.

Make NetworkMenuModel a ui::MenuModel again.

This is a necessary refactoring to a single menu model to define both views menu and WebUI menu.

BUG=chromium-os:17892
TEST=none


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

[sky, 2011-08-02 15:54:55]

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_ite...
File views/controls/menu/menu_item_view.h (left):

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_ite...
views/controls/menu/menu_item_view.h:325: void set_margins(int top_margin, int
bottom_margin) {
SetMargins

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_mod...
File views/controls/menu/menu_model_adapter.cc (right):

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_mod...
views/controls/menu/menu_model_adapter.cc:38: if (!menu->GetMenuController())
Can you add a test for coverage of this case.

[rhashimoto, 2011-08-02 23:04:07]

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_ite...
File views/controls/menu/menu_item_view.h (left):

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_ite...
views/controls/menu/menu_item_view.h:325: void set_margins(int top_margin, int
bottom_margin) {
On 2011/08/02 15:54:56, sky wrote:
> SetMargins

Done.

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_mod...
File views/controls/menu/menu_model_adapter.cc (right):

http://codereview.chromium.org/7541002/diff/3004/views/controls/menu/menu_mod...
views/controls/menu/menu_model_adapter.cc:38: if (!menu->GetMenuController())
On 2011/08/02 15:54:56, sky wrote:
> Can you add a test for coverage of this case.

Done.

[sky, 2011-08-02 23:08:12]

LGTM

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
File chrome/browser/ui/views/menu_model_adapter_test.cc (right):

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
chrome/browser/ui/views/menu_model_adapter_test.cc:143: SubMenuModel() :
: on next line.

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
chrome/browser/ui/views/menu_model_adapter_test.cc:179: };
DISALLOW_BLAH_BLAH here and in other classes.

[rhashimoto, 2011-08-02 23:53:36]

Hi Nikita -

Sorry I couldn't get this landed today - I got hung up between writing the test
and being sheriff.  I think it's ready if it makes it through the trybots and
will try to commit it ASAP tomorrow.

Roy

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
File chrome/browser/ui/views/menu_model_adapter_test.cc (right):

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
chrome/browser/ui/views/menu_model_adapter_test.cc:143: SubMenuModel() :
On 2011/08/02 23:08:12, sky wrote:
> : on next line.

Done.

http://codereview.chromium.org/7541002/diff/9001/chrome/browser/ui/views/menu...
chrome/browser/ui/views/menu_model_adapter_test.cc:179: };
On 2011/08/02 23:08:12, sky wrote:
> DISALLOW_BLAH_BLAH here and in other classes.

Done.

[rhashimoto, 2011-08-03 03:45:08]

Hi Nikita -

The trybots are green...but the tree is red.  If you need to you can land it
yourself, otherwise I'll commit it at my first opportunity.

Roy

[Nikita (slow), 2011-08-03 12:13:31]

Thanks!
I've toggled commit checkbox for this CL.

[commit-bot: I haz the power, 2011-08-03 13:41:24]

List of reviewers changed.

[Nikita (slow), 2011-08-03 14:16:26]

LGTM

[commit-bot: I haz the power, 2011-08-03 15:45:03]

Change committed as 95244