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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 years, 6 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 (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 "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <tuple>
8 9
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/location.h" 11 #include "base/location.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "base/test/test_timeouts.h" 17 #include "base/test/test_timeouts.h"
17 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 state_ = state; 218 state_ = state;
218 quit_.Run(); 219 quit_.Run();
219 } 220 }
220 } 221 }
221 222
222 // BrowserMessageFilter: 223 // BrowserMessageFilter:
223 bool OnMessageReceived(const IPC::Message& message) override { 224 bool OnMessageReceived(const IPC::Message& message) override {
224 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { 225 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
225 InputHostMsg_HandleInputEvent_ACK::Param params; 226 InputHostMsg_HandleInputEvent_ACK::Param params;
226 InputHostMsg_HandleInputEvent_ACK::Read(&message, &params); 227 InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
227 blink::WebInputEvent::Type type = base::get<0>(params).type; 228 blink::WebInputEvent::Type type = std::get<0>(params).type;
228 InputEventAckState ack = base::get<0>(params).state; 229 InputEventAckState ack = std::get<0>(params).state;
229 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 230 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
230 base::Bind(&InputEventMessageFilterWaitsForAcks::ReceivedEventAck, 231 base::Bind(&InputEventMessageFilterWaitsForAcks::ReceivedEventAck,
231 this, type, ack)); 232 this, type, ack));
232 } 233 }
233 return false; 234 return false;
234 } 235 }
235 236
236 base::Closure quit_; 237 base::Closure quit_;
237 blink::WebInputEvent::Type type_; 238 blink::WebInputEvent::Type type_;
238 InputEventAckState state_; 239 InputEventAckState state_;
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 details = dispatcher->OnEventFromSource(&release); 1129 details = dispatcher->OnEventFromSource(&release);
1129 ASSERT_FALSE(details.dispatcher_destroyed); 1130 ASSERT_FALSE(details.dispatcher_destroyed);
1130 WaitAFrame(); 1131 WaitAFrame();
1131 1132
1132 EXPECT_LT(0, tracker.num_overscroll_updates()); 1133 EXPECT_LT(0, tracker.num_overscroll_updates());
1133 EXPECT_FALSE(tracker.overscroll_completed()); 1134 EXPECT_FALSE(tracker.overscroll_completed());
1134 } 1135 }
1135 } 1136 }
1136 1137
1137 } // namespace content 1138 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698