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

Side by Side Diff: chrome/browser/storage_monitor/storage_monitor.h

Issue 20163004: base: Re-apply WeakPtr support for SequencedWorkerPools, fixing deadlock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back death test threadsafe mode flag that got lost. Created 7 years, 5 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/threading/sequenced_worker_pool.cc ('k') | content/renderer/media/webmediaplayer_ms.h » ('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 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_ 5 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
6 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_ 6 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/observer_list_threadsafe.h" 14 #include "base/observer_list_threadsafe.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "base/threading/thread_checker.h"
17 #include "chrome/browser/storage_monitor/storage_info.h" 18 #include "chrome/browser/storage_monitor/storage_info.h"
18 19
19 class ChromeBrowserMainPartsLinux; 20 class ChromeBrowserMainPartsLinux;
20 class ChromeBrowserMainPartsMac; 21 class ChromeBrowserMainPartsMac;
21 class MediaGalleriesPlatformAppBrowserTest; 22 class MediaGalleriesPlatformAppBrowserTest;
22 class MediaGalleriesPrivateApiTest; 23 class MediaGalleriesPrivateApiTest;
23 class MediaGalleriesPrivateEjectApiTest; 24 class MediaGalleriesPrivateEjectApiTest;
24 class SystemStorageApiTest; 25 class SystemStorageApiTest;
25 class SystemStorageEjectApiTest; 26 class SystemStorageEjectApiTest;
26 27
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 180
180 // Map of all known storage devices,including fixed and removable storages. 181 // Map of all known storage devices,including fixed and removable storages.
181 StorageMap storage_map_; 182 StorageMap storage_map_;
182 183
183 scoped_ptr<TransientDeviceIds> transient_device_ids_; 184 scoped_ptr<TransientDeviceIds> transient_device_ids_;
184 }; 185 };
185 186
186 } // namespace chrome 187 } // namespace chrome
187 188
188 #endif // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_ 189 #endif // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
OLDNEW
« no previous file with comments | « base/threading/sequenced_worker_pool.cc ('k') | content/renderer/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698