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

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

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Destroy ash ViewsDelegate Created 5 years, 6 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
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/base/test/ui_controls.h" 9 #include "ui/base/test/ui_controls.h"
10 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
11 #include "ui/views/controls/menu/menu_item_view.h" 11 #include "ui/views/controls/menu/menu_item_view.h"
12 #include "ui/views/controls/menu/menu_runner.h" 12 #include "ui/views/controls/menu/menu_runner.h"
13 #include "ui/views/widget/widget.h"
13 14
14 MenuTestBase::MenuTestBase() 15 MenuTestBase::MenuTestBase()
15 : ViewEventTestBase(), 16 : ViewEventTestBase(),
16 button_(NULL), 17 button_(NULL),
17 menu_(NULL), 18 menu_(NULL),
18 last_command_(0) { 19 last_command_(0) {
19 } 20 }
20 21
21 MenuTestBase::~MenuTestBase() { 22 MenuTestBase::~MenuTestBase() {
22 } 23 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(), 82 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(),
82 button_, 83 button_,
83 bounds, 84 bounds,
84 views::MENU_ANCHOR_TOPLEFT, 85 views::MENU_ANCHOR_TOPLEFT,
85 ui::MENU_SOURCE_NONE)); 86 ui::MENU_SOURCE_NONE));
86 } 87 }
87 88
88 void MenuTestBase::ExecuteCommand(int id) { 89 void MenuTestBase::ExecuteCommand(int id) {
89 last_command_ = id; 90 last_command_ = id;
90 } 91 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698