Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/ui/views/menu_item_view_test.cc

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/callback.h" 5 #include "base/callback.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/test/base/ui_test_utils.h" 7 #include "chrome/test/base/ui_test_utils.h"
8 #include "chrome/test/base/view_event_test_base.h" 8 #include "chrome/test/base/view_event_test_base.h"
9 #include "ui/ui_controls/ui_controls.h" 9 #include "ui/ui_controls/ui_controls.h"
10 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 views::SubmenuView* submenu = menu_->GetSubmenu(); 210 views::SubmenuView* submenu = menu_->GetSubmenu();
211 ASSERT_TRUE(submenu); 211 ASSERT_TRUE(submenu);
212 ASSERT_TRUE(submenu->IsShowing()); 212 ASSERT_TRUE(submenu->IsShowing());
213 ASSERT_EQ(2, submenu->GetMenuItemCount()); 213 ASSERT_EQ(2, submenu->GetMenuItemCount());
214 214
215 inserted_item_ = menu_->AddMenuItemAt(INSERT_INDEX, 215 inserted_item_ = menu_->AddMenuItemAt(INSERT_INDEX,
216 1000, 216 1000,
217 ASCIIToUTF16("inserted item"), 217 ASCIIToUTF16("inserted item"),
218 gfx::ImageSkia(), 218 gfx::ImageSkia(),
219 views::MenuItemView::NORMAL); 219 views::MenuItemView::NORMAL,
220 ui::NORMAL_SEPARATOR);
220 ASSERT_TRUE(inserted_item_); 221 ASSERT_TRUE(inserted_item_);
221 menu_->ChildrenChanged(); 222 menu_->ChildrenChanged();
222 223
223 // click an item and pass control to the next step 224 // click an item and pass control to the next step
224 views::MenuItemView* item = submenu->GetMenuItemAt(SELECT_INDEX); 225 views::MenuItemView* item = submenu->GetMenuItemAt(SELECT_INDEX);
225 ASSERT_TRUE(item); 226 ASSERT_TRUE(item);
226 Click(item, CreateEventTask(this, &MenuItemViewTestInsert::Step2)); 227 Click(item, CreateEventTask(this, &MenuItemViewTestInsert::Step2));
227 } 228 }
228 229
229 // Check clicked item and complete test. 230 // Check clicked item and complete test.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 Click(submenu_, 320 Click(submenu_,
320 CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step2)); 321 CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step2));
321 } 322 }
322 323
323 // Insert item at INSERT_INDEX. 324 // Insert item at INSERT_INDEX.
324 void Step2() { 325 void Step2() {
325 inserted_item_ = menu_->AddMenuItemAt(INSERT_INDEX, 326 inserted_item_ = menu_->AddMenuItemAt(INSERT_INDEX,
326 1000, 327 1000,
327 ASCIIToUTF16("inserted item"), 328 ASCIIToUTF16("inserted item"),
328 gfx::ImageSkia(), 329 gfx::ImageSkia(),
329 views::MenuItemView::NORMAL); 330 views::MenuItemView::NORMAL,
331 ui::NORMAL_SEPARATOR);
330 ASSERT_TRUE(inserted_item_); 332 ASSERT_TRUE(inserted_item_);
331 menu_->ChildrenChanged(); 333 menu_->ChildrenChanged();
332 334
333 Click(inserted_item_, 335 Click(inserted_item_,
334 CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step3)); 336 CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step3));
335 } 337 }
336 338
337 void Step3() { 339 void Step3() {
338 Done(); 340 Done();
339 } 341 }
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; 537 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
536 #if defined(OS_WIN) 538 #if defined(OS_WIN)
537 #define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0 539 #define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0
538 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1 540 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1
539 #else 541 #else
540 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0 542 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0
541 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1 543 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1
542 #endif 544 #endif
543 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0) 545 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0)
544 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1) 546 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.cc ('k') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698