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"
@@ skipping 62 matching lines @@
 void SimpleMenuModel::AddItem(int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
                 NULL };
   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(const string16& separator_type) {
+#if defined(OS_WINDOWS)
+  DCHECK(separator_type == MenuModel::NORMAL_SEPARATOR)
+#endif
+  Item item = { kSeparatorId, separator_type, gfx::ImageSkia(), TYPE_SEPARATOR,

[sky, 2012/08/20 15:58:17]

Embedding the separator type in the label is a hack. Add a new field.

[Mr4D (OOO till 08-26), 2012/08/21 01:13:18]

Okay, done.

+                -1, NULL, NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItem(int command_id, const string16& label) {
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_CHECK, -1, NULL,
                 NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItemWithStringId(int command_id, int string_id) {
@@ skipping 36 matching lines @@
   Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
                 NULL };
   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,
+                                        const string16& separator_type) {
+#if defined(OS_WINDOWS)
+  DCHECK(separator_type == MenuModel::NORMAL_SEPARATOR)
+#endif
+  Item item = { kSeparatorId, separator_type, gfx::ImageSkia(), TYPE_SEPARATOR,
+                -1, NULL, NULL };
   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 };
   InsertItemAtIndex(item, index);
 }
 
@@ skipping 203 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