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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/automation/ui_controls.h" 7 #include "chrome/browser/automation/ui_controls.h"
8 #include "chrome/test/base/view_event_test_base.h" 8 #include "chrome/test/base/view_event_test_base.h"
9 #include "ui/base/models/menu_model.h" 9 #include "ui/base/models/menu_model.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_controller.h" 11 #include "ui/views/controls/menu/menu_controller.h"
12 #include "ui/views/controls/menu/menu_item_view.h" 12 #include "ui/views/controls/menu/menu_item_view.h"
13 #include "ui/views/controls/menu/menu_model_adapter.h" 13 #include "ui/views/controls/menu/menu_model_adapter.h"
14 #include "ui/views/controls/menu/menu_runner.h" 14 #include "ui/views/controls/menu/menu_runner.h"
15 #include "ui/views/controls/menu/submenu_view.h" 15 #include "ui/views/controls/menu/submenu_view.h"
16 #include "ui/views/controls/menu/view_menu_delegate.h" 16 #include "ui/views/controls/menu/view_menu_delegate.h"
17 #include "ui/views/test/test_views_delegate.h" 17 #include "ui/views/test/test_views_delegate.h"
18 #include "ui/views/views_delegate.h"
18 #include "ui/views/widget/root_view.h" 19 #include "ui/views/widget/root_view.h"
19 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
20 #include "views/views_delegate.h"
21 21
22 namespace { 22 namespace {
23 23
24 const int kTopMenuBaseId = 100; 24 const int kTopMenuBaseId = 100;
25 const int kSubMenuBaseId = 200; 25 const int kSubMenuBaseId = 200;
26 26
27 // ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter. 27 // ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter.
28 class TestViewsDelegate : public views::ViewsDelegate { 28 class TestViewsDelegate : public views::ViewsDelegate {
29 public: 29 public:
30 TestViewsDelegate() { 30 TestViewsDelegate() {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 TestViewsDelegate views_delegate_; 360 TestViewsDelegate views_delegate_;
361 361
362 views::MenuButton* button_; 362 views::MenuButton* button_;
363 TopMenuModel top_menu_model_; 363 TopMenuModel top_menu_model_;
364 views::MenuModelAdapter menu_model_adapter_; 364 views::MenuModelAdapter menu_model_adapter_;
365 views::MenuItemView* menu_; 365 views::MenuItemView* menu_;
366 scoped_ptr<views::MenuRunner> menu_runner_; 366 scoped_ptr<views::MenuRunner> menu_runner_;
367 }; 367 };
368 368
369 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) 369 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/icon_label_bubble_view.h ('k') | chrome/browser/ui/views/notifications/balloon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698