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

Side by Side Diff: ui/events/event_dispatcher_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/events/event.cc ('k') | ui/events/event_processor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/events/event_dispatcher.h" 5 #include "ui/events/event_dispatcher.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/event_dispatcher.h" 10 #include "ui/events/event_dispatcher.h"
(...skipping 28 matching lines...) Expand all
39 handler_list_.clear(); 39 handler_list_.clear();
40 valid_ = true; 40 valid_ = true;
41 } 41 }
42 42
43 private: 43 private:
44 // Overridden from EventTarget: 44 // Overridden from EventTarget:
45 bool CanAcceptEvent(const ui::Event& event) override { return true; } 45 bool CanAcceptEvent(const ui::Event& event) override { return true; }
46 46
47 EventTarget* GetParentTarget() override { return parent_; } 47 EventTarget* GetParentTarget() override { return parent_; }
48 48
49 scoped_ptr<EventTargetIterator> GetChildIterator() const override { 49 std::unique_ptr<EventTargetIterator> GetChildIterator() const override {
50 return nullptr; 50 return nullptr;
51 } 51 }
52 52
53 EventTargeter* GetEventTargeter() override { return NULL; } 53 EventTargeter* GetEventTargeter() override { return NULL; }
54 54
55 TestTarget* parent_; 55 TestTarget* parent_;
56 std::vector<int> handler_list_; 56 std::vector<int> handler_list_;
57 bool valid_; 57 bool valid_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(TestTarget); 59 DISALLOW_COPY_AND_ASSIGN(TestTarget);
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 NonCancelableEvent event; 585 NonCancelableEvent event;
586 EventDispatchDetails details = dispatcher->ProcessEvent(&target, &event); 586 EventDispatchDetails details = dispatcher->ProcessEvent(&target, &event);
587 EXPECT_TRUE(details.dispatcher_destroyed); 587 EXPECT_TRUE(details.dispatcher_destroyed);
588 EXPECT_EQ(2U, target.handler_list().size()); 588 EXPECT_EQ(2U, target.handler_list().size());
589 EXPECT_EQ(1, target.handler_list()[0]); 589 EXPECT_EQ(1, target.handler_list()[0]);
590 EXPECT_EQ(2, target.handler_list()[1]); 590 EXPECT_EQ(2, target.handler_list()[1]);
591 } 591 }
592 } 592 }
593 593
594 } // namespace ui 594 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/event_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698