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

Side by Side Diff: content/browser/gamepad/gamepad_provider.cc

Issue 790473002: Remove the happens-before annotations from base/memory/singleton.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation of content/browser/gamepad/gamepad_provider.cc Created 5 years, 10 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 | « base/trace_event/trace_event_synthetic_delay.cc ('k') | content/gpu/gpu_main.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 <cmath> 5 #include <cmath>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
13 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
14 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
15 #include "content/browser/gamepad/gamepad_data_fetcher.h" 16 #include "content/browser/gamepad/gamepad_data_fetcher.h"
16 #include "content/browser/gamepad/gamepad_platform_data_fetcher.h" 17 #include "content/browser/gamepad/gamepad_platform_data_fetcher.h"
17 #include "content/browser/gamepad/gamepad_provider.h" 18 #include "content/browser/gamepad/gamepad_provider.h"
18 #include "content/browser/gamepad/gamepad_service.h" 19 #include "content/browser/gamepad/gamepad_service.h"
19 #include "content/common/gamepad_hardware_buffer.h" 20 #include "content/common/gamepad_hardware_buffer.h"
20 #include "content/common/gamepad_messages.h" 21 #include "content/common/gamepad_messages.h"
21 #include "content/common/gamepad_user_gesture.h" 22 #include "content/common/gamepad_user_gesture.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 320 }
320 if (!had_gesture_before && ever_had_user_gesture_) { 321 if (!had_gesture_before && ever_had_user_gesture_) {
321 // Initialize pad_states_ for the first time. 322 // Initialize pad_states_ for the first time.
322 for (size_t i = 0; i < WebGamepads::itemsLengthCap; ++i) { 323 for (size_t i = 0; i < WebGamepads::itemsLengthCap; ++i) {
323 pad_states_.get()[i].SetPad(pads.items[i]); 324 pad_states_.get()[i].SetPad(pads.items[i]);
324 } 325 }
325 } 326 }
326 } 327 }
327 328
328 } // namespace content 329 } // namespace content
OLDNEW
« no previous file with comments | « base/trace_event/trace_event_synthetic_delay.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698