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

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

Issue 442633003: MacViews: Remove aura dependency from menu_test_base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/ui/views/menu_test_base.h" 6 #include "chrome/browser/ui/views/menu_test_base.h"
7 #include "chrome/test/base/interactive_test_utils.h" 7 #include "chrome/test/base/interactive_test_utils.h"
8 #include "chrome/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "ui/aura/window.h"
10 #include "ui/base/test/ui_controls.h" 9 #include "ui/base/test/ui_controls.h"
11 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
12 #include "ui/views/controls/menu/menu_item_view.h" 11 #include "ui/views/controls/menu/menu_item_view.h"
13 #include "ui/views/controls/menu/menu_runner.h" 12 #include "ui/views/controls/menu/menu_runner.h"
14 13
15 MenuTestBase::MenuTestBase() 14 MenuTestBase::MenuTestBase()
16 : ViewEventTestBase(), 15 : ViewEventTestBase(),
17 button_(NULL), 16 button_(NULL),
18 menu_(NULL), 17 menu_(NULL),
19 last_command_(0) { 18 last_command_(0) {
20 } 19 }
21 20
22 MenuTestBase::~MenuTestBase() { 21 MenuTestBase::~MenuTestBase() {
23 } 22 }
24 23
25 void MenuTestBase::Click(views::View* view, const base::Closure& next) { 24 void MenuTestBase::Click(views::View* view, const base::Closure& next) {
26 ui_test_utils::MoveMouseToCenterAndPress( 25 ui_test_utils::MoveMouseToCenterAndPress(
27 view, 26 view,
28 ui_controls::LEFT, 27 ui_controls::LEFT,
29 ui_controls::DOWN | ui_controls::UP, 28 ui_controls::DOWN | ui_controls::UP,
30 next); 29 next);
31 } 30 }
32 31
33 void MenuTestBase::KeyPress(ui::KeyboardCode keycode, 32 void MenuTestBase::KeyPress(ui::KeyboardCode keycode,
34 const base::Closure& next) { 33 const base::Closure& next) {
35 ui_controls::SendKeyPressNotifyWhenDone( 34 ui_controls::SendKeyPressNotifyWhenDone(
36 GetWidget()->GetNativeView()->GetRootWindow(), keycode, false, false, 35 GetWidget()->GetNativeWindow(), keycode, false, false,
sky 2014/08/05 17:18:32 This isn't necessarily the same thing. Does ui_con
tapted 2014/08/05 23:04:22 Yeah - I checked they all amount to the same thing
37 false, false, next); 36 false, false, next);
38 } 37 }
39 38
40 int MenuTestBase::GetMenuRunnerFlags() { 39 int MenuTestBase::GetMenuRunnerFlags() {
41 return views::MenuRunner::HAS_MNEMONICS; 40 return views::MenuRunner::HAS_MNEMONICS;
42 } 41 }
43 42
44 void MenuTestBase::SetUp() { 43 void MenuTestBase::SetUp() {
45 button_ = new views::MenuButton( 44 button_ = new views::MenuButton(
46 NULL, base::ASCIIToUTF16("Menu Test"), this, true); 45 NULL, base::ASCIIToUTF16("Menu Test"), this, true);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(), 81 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(),
83 button_, 82 button_,
84 bounds, 83 bounds,
85 views::MENU_ANCHOR_TOPLEFT, 84 views::MENU_ANCHOR_TOPLEFT,
86 ui::MENU_SOURCE_NONE)); 85 ui::MENU_SOURCE_NONE));
87 } 86 }
88 87
89 void MenuTestBase::ExecuteCommand(int id) { 88 void MenuTestBase::ExecuteCommand(int id) {
90 last_command_ = id; 89 last_command_ = id;
91 } 90 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698