Setting the touch wrench menu as default menu for ChromeOS

ui/base/models/simple_menu_model.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 "ui/base/models/simple_menu_model.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace ui {
 
 const int kSeparatorId = -1;
 
 struct SimpleMenuModel::Item {
   int command_id;
   string16 label;
   gfx::ImageSkia icon;
   ItemType type;
   int group_id;
   MenuModel* submenu;
   ButtonMenuItemModel* button_model;
+  MenuSeparatorStyle separator_style;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel::Delegate, public:
 
 bool SimpleMenuModel::Delegate::IsCommandIdVisible(int command_id) const {
   return true;
 }
 
 bool SimpleMenuModel::Delegate::IsItemForCommandIdDynamic(
@@ skipping 31 matching lines @@
     : delegate_(delegate),
       menu_model_delegate_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 SimpleMenuModel::~SimpleMenuModel() {
 }
 
 void SimpleMenuModel::AddItem(int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddItemWithStringId(int command_id, int string_id) {
   AddItem(command_id, l10n_util::GetStringUTF16(string_id));
 }
 
-void SimpleMenuModel::AddSeparator() {
-  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR, -1,
-                NULL, NULL };
+void SimpleMenuModel::AddSeparator(MenuSeparatorStyle separator_type) {
+#if defined(OS_WINDOWS)

[sky, 2012/08/21 03:03:25]

if !defined(USE_AURA) right?

Also, instead of the DCHECK make it a NOTIMPLEMENTED.

[Mr4D (OOO till 08-26), 2012/08/21 15:37:16]

Actually - no? The new separator style should be used for any version of the
wrench menu. The only 'version' which cannot handle it is Windows, because the
separator is there used from the normal menu and therefore fixed. Please correct
me if this has changed.

Beside that: done.

[sky, 2012/08/21 19:36:29]

This is what NOTIMPLEMENTED is meant for, it means this code path isn't current
implemented but should be at some point.

[Mr4D (OOO till 08-26), 2012/08/21 21:34:54]

No - you got me wrong here. I was not referring to NOTIMPLEMENTED. I referred to
USE_AURA. I thought that the changes should only be visible on ChromeOS and all
other OS'ses should remain as they are. Especially the flavor you were working
on last month.

[sky, 2012/08/21 22:35:22]

Agreed. My first comment was this define should be !defined(USE_AURA), which is
what you have now.

+  DCHECK(separator_type == NORMAL_SEPARATOR)
+#endif
+  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR,
+                -1, NULL, NULL , separator_type };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItem(int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_CHECK, -1, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItemWithStringId(int command_id, int string_id) {
   AddCheckItem(command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::AddRadioItem(int command_id, const string16& label,
                                    int group_id) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_RADIO, group_id, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddRadioItemWithStringId(int command_id, int string_id,
                                                int group_id) {
   AddRadioItem(command_id, l10n_util::GetStringUTF16(string_id), group_id);
 }
 
 void SimpleMenuModel::AddButtonItem(int command_id,
                                     ButtonMenuItemModel* model) {
   Item item = { command_id, string16(), gfx::ImageSkia(), TYPE_BUTTON_ITEM, -1,
-                NULL, model };
+                NULL, model, NO_SEPARATOR };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddSubMenu(int command_id, const string16& label,
                                  MenuModel* model) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_SUBMENU, -1, model,
-                NULL };
+                NULL, NO_SEPARATOR };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddSubMenuWithStringId(int command_id,
                                              int string_id, MenuModel* model) {
   AddSubMenu(command_id, l10n_util::GetStringUTF16(string_id), model);
 }
 
 void SimpleMenuModel::InsertItemAt(
     int index, int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertItemWithStringIdAt(
     int index, int command_id, int string_id) {
   InsertItemAt(index, command_id, l10n_util::GetStringUTF16(string_id));
 }
 
-void SimpleMenuModel::InsertSeparatorAt(int index) {
-  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR, -1,
-                NULL, NULL };
+void SimpleMenuModel::InsertSeparatorAt(int index,
+                                        MenuSeparatorStyle separator_type) {
+#if defined(OS_WINDOWS)

[sky, 2012/08/21 03:03:25]

Same comment about define.

[Mr4D (OOO till 08-26), 2012/08/21 15:37:16]

Done.

+  DCHECK(separator_type == NORMAL_SEPARATOR)
+#endif
+  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR,
+                -1, NULL, NULL, separator_type };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertCheckItemAt(
     int index, int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_CHECK, -1, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertCheckItemWithStringIdAt(
     int index, int command_id, int string_id) {
   InsertCheckItemAt(
       FlipIndex(index), command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::InsertRadioItemAt(
     int index, int command_id, const string16& label, int group_id) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_RADIO, group_id, NULL,
-                NULL };
+                NULL, NO_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertRadioItemWithStringIdAt(
     int index, int command_id, int string_id, int group_id) {
   InsertRadioItemAt(
       index, command_id, l10n_util::GetStringUTF16(string_id), group_id);
 }
 
 void SimpleMenuModel::InsertSubMenuAt(
     int index, int command_id, const string16& label, MenuModel* model) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_SUBMENU, -1, model,
-                NULL };
+                NULL, NO_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertSubMenuWithStringIdAt(
     int index, int command_id, int string_id, MenuModel* model) {
   InsertSubMenuAt(index, command_id, l10n_util::GetStringUTF16(string_id),
                   model);
 }
 
 void SimpleMenuModel::SetIcon(int index, const gfx::ImageSkia& icon) {
@@ skipping 26 matching lines @@
 }
 
 int SimpleMenuModel::GetItemCount() const {
   return static_cast<int>(items_.size());
 }
 
 MenuModel::ItemType SimpleMenuModel::GetTypeAt(int index) const {
   return items_[ValidateItemIndex(FlipIndex(index))].type;
 }
 
+ui::MenuSeparatorStyle SimpleMenuModel::GetSeparatorStyleAt(int index) const {
+  return items_[ValidateItemIndex(FlipIndex(index))].separator_style;
+}
+
 int SimpleMenuModel::GetCommandIdAt(int index) const {
   return items_[ValidateItemIndex(FlipIndex(index))].command_id;
 }
 
 string16 SimpleMenuModel::GetLabelAt(int index) const {
   if (IsItemDynamicAt(index))
     return delegate_->GetLabelForCommandId(GetCommandIdAt(index));
   return items_[ValidateItemIndex(FlipIndex(index))].label;
 }
 
@@ skipping 124 matching lines @@
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace ui