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

Side by Side Diff: ui/views/controls/button/menu_button_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 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
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 "ui/views/controls/button/menu_button.h" 5 #include "ui/views/controls/button/menu_button.h"
6 6
7 #include "base/macros.h"
7 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h"
9 #include "ui/base/dragdrop/drag_drop_types.h" 11 #include "ui/base/dragdrop/drag_drop_types.h"
10 #include "ui/events/test/event_generator.h" 12 #include "ui/events/test/event_generator.h"
11 #include "ui/views/controls/button/menu_button_listener.h" 13 #include "ui/views/controls/button/menu_button_listener.h"
12 #include "ui/views/drag_controller.h" 14 #include "ui/views/drag_controller.h"
13 #include "ui/views/test/views_test_base.h" 15 #include "ui/views/test/views_test_base.h"
14 16
15 #if defined(USE_AURA) 17 #if defined(USE_AURA)
16 #include "ui/events/event.h" 18 #include "ui/events/event.h"
17 #include "ui/events/event_handler.h" 19 #include "ui/events/event_handler.h"
18 #include "ui/wm/public/drag_drop_client.h" 20 #include "ui/wm/public/drag_drop_client.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 498
497 generator.MoveTouch(gfx::Point(10, 30)); 499 generator.MoveTouch(gfx::Point(10, 30));
498 generator.ReleaseTouch(); 500 generator.ReleaseTouch();
499 EXPECT_EQ(Button::STATE_NORMAL, button()->state()); 501 EXPECT_EQ(Button::STATE_NORMAL, button()->state());
500 EXPECT_EQ(nullptr, menu_button_listener.last_source()); 502 EXPECT_EQ(nullptr, menu_button_listener.last_source());
501 } 503 }
502 504
503 #endif // !defined(OS_MACOSX) || defined(USE_AURA) 505 #endif // !defined(OS_MACOSX) || defined(USE_AURA)
504 506
505 } // namespace views 507 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698