chrome/browser/ui/views/menu_model_adapter_test.cc - Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

« no previous file with comments | « chrome/browser/ui/views/menu_item_view_interactive_uitest.cc ('k') | chrome/browser/ui/views/menu_test_base.h » ('j') | no next file with comments »

OLD	NEW
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/location.h"	6 #include "base/location.h"

	7 #include "base/macros.h"

7 #include "base/single_thread_task_runner.h"	8 #include "base/single_thread_task_runner.h"

8 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

9 #include "base/thread_task_runner_handle.h"	10 #include "base/thread_task_runner_handle.h"

10 #include "chrome/test/base/interactive_test_utils.h"	11 #include "chrome/test/base/interactive_test_utils.h"

11 #include "chrome/test/base/ui_test_utils.h"	12 #include "chrome/test/base/ui_test_utils.h"

12 #include "chrome/test/base/view_event_test_base.h"	13 #include "chrome/test/base/view_event_test_base.h"

13 #include "ui/base/models/menu_model.h"	14 #include "ui/base/models/menu_model.h"

14 #include "ui/base/test/ui_controls.h"	15 #include "ui/base/test/ui_controls.h"

15 #include "ui/views/controls/button/menu_button.h"	16 #include "ui/views/controls/button/menu_button.h"

16 #include "ui/views/controls/button/menu_button_listener.h"	17 #include "ui/views/controls/button/menu_button_listener.h"

(...skipping 252 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
269	270

270 views::MenuButton* button_;	271 views::MenuButton* button_;

271 TopMenuModel top_menu_model_;	272 TopMenuModel top_menu_model_;

272 views::MenuModelAdapter menu_model_adapter_;	273 views::MenuModelAdapter menu_model_adapter_;

273 views::MenuItemView* menu_;	274 views::MenuItemView* menu_;

274 scoped_ptr<views::MenuRunner> menu_runner_;	275 scoped_ptr<views::MenuRunner> menu_runner_;

275 };	276 };

276	277

277 // If this flakes, disable and log details in http://crbug.com/523255.	278 // If this flakes, disable and log details in http://crbug.com/523255.

278 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)	279 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)

OLD	NEW