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

Side by Side Diff: ui/views/controls/menu/menu_model_adapter_unittest.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 "ui/views/controls/menu/menu_model_adapter.h" 5 #include "ui/views/controls/menu/menu_model_adapter.h"
6 6
7 #include "base/macros.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "ui/base/models/menu_model.h" 9 #include "ui/base/models/menu_model.h"
9 #include "ui/base/models/menu_model_delegate.h" 10 #include "ui/base/models/menu_model_delegate.h"
10 #include "ui/views/controls/menu/menu_item_view.h" 11 #include "ui/views/controls/menu/menu_item_view.h"
11 #include "ui/views/controls/menu/menu_runner.h" 12 #include "ui/views/controls/menu/menu_runner.h"
12 #include "ui/views/controls/menu/submenu_view.h" 13 #include "ui/views/controls/menu/submenu_view.h"
13 #include "ui/views/test/views_test_base.h" 14 #include "ui/views/test/views_test_base.h"
14 15
15 namespace { 16 namespace {
16 17
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 submodel->set_last_activation(-1); 267 submodel->set_last_activation(-1);
267 } 268 }
268 269
269 // Check that selecting the root item is safe. The MenuModel does 270 // Check that selecting the root item is safe. The MenuModel does
270 // not care about the root so MenuModelAdapter should do nothing 271 // not care about the root so MenuModelAdapter should do nothing
271 // (not hit the NOTREACHED check) when the root is selected. 272 // (not hit the NOTREACHED check) when the root is selected.
272 static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu); 273 static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu);
273 } 274 }
274 275
275 } // namespace views 276 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698