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

Side by Side Diff: chrome/browser/extensions/api/system_info/system_info_api.cc

Issue 148083014: ExtensionSystem cleanup part 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/extensions/api/system_info/system_info_api.h" 5 #include "chrome/browser/extensions/api/system_info/system_info_api.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h" 16 #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
17 #include "chrome/browser/extensions/event_router_forwarder.h" 17 #include "chrome/browser/extensions/event_router_forwarder.h"
18 #include "chrome/browser/storage_monitor/removable_storage_observer.h" 18 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
19 #include "chrome/browser/storage_monitor/storage_info.h" 19 #include "chrome/browser/storage_monitor/storage_info.h"
20 #include "chrome/browser/storage_monitor/storage_monitor.h" 20 #include "chrome/browser/storage_monitor/storage_monitor.h"
21 #include "chrome/common/extensions/api/system_display.h" 21 #include "chrome/common/extensions/api/system_display.h"
22 #include "chrome/common/extensions/api/system_storage.h" 22 #include "chrome/common/extensions/api/system_storage.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "extensions/browser/extension_system.h"
24 #include "ui/gfx/display_observer.h" 25 #include "ui/gfx/display_observer.h"
25 26
26 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
27 #include "ash/shell.h" 28 #include "ash/shell.h"
28 #include "ui/gfx/screen.h" 29 #include "ui/gfx/screen.h"
29 #endif 30 #endif
30 31
31 namespace extensions { 32 namespace extensions {
32 33
33 using api::system_storage::StorageUnitInfo; 34 using api::system_storage::StorageUnitInfo;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) { 248 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
248 if (IsSystemStorageEvent(details.event_name)) { 249 if (IsSystemStorageEvent(details.event_name)) {
249 StorageMonitor::GetInstance()->EnsureInitialized( 250 StorageMonitor::GetInstance()->EnsureInitialized(
250 base::Bind(&RemoveEventListener, details.event_name)); 251 base::Bind(&RemoveEventListener, details.event_name));
251 } else { 252 } else {
252 RemoveEventListener(details.event_name); 253 RemoveEventListener(details.event_name);
253 } 254 }
254 } 255 }
255 256
256 } // namespace extensions 257 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698