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

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

Issue 18578008: [SystemInfo API] Move Storage API out of experimental namespace and rename to the "system" namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix PermissionTest unittest. Created 7 years, 4 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 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/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/extensions/api/system_info_storage/storage_info_provide r.h" 17 #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
18 #include "chrome/browser/extensions/event_names.h" 18 #include "chrome/browser/extensions/event_names.h"
19 #include "chrome/browser/extensions/event_router_forwarder.h" 19 #include "chrome/browser/extensions/event_router_forwarder.h"
20 #include "chrome/browser/storage_monitor/removable_storage_observer.h" 20 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
21 #include "chrome/browser/storage_monitor/storage_info.h" 21 #include "chrome/browser/storage_monitor/storage_info.h"
22 #include "chrome/browser/storage_monitor/storage_monitor.h" 22 #include "chrome/browser/storage_monitor/storage_monitor.h"
23 #include "chrome/common/extensions/api/experimental_system_info_storage.h" 23 #include "chrome/common/extensions/api/system_storage.h"
24 #include "ui/gfx/display_observer.h" 24 #include "ui/gfx/display_observer.h"
25 25
26 #if defined(USE_ASH) 26 #if defined(USE_ASH)
27 #include "ash/screen_ash.h" 27 #include "ash/screen_ash.h"
28 #include "ash/shell.h" 28 #include "ash/shell.h"
29 #endif 29 #endif
30 30
31 namespace extensions { 31 namespace extensions {
32 32
33 using api::experimental_system_info_storage::StorageFreeSpaceChangeInfo; 33 using api::system_storage::StorageFreeSpaceChangeInfo;
34 using api::experimental_system_info_storage::StorageUnitInfo; 34 using api::system_storage::StorageUnitInfo;
35 using api::experimental_system_info_storage::StorageUnitType; 35 using api::system_storage::StorageUnitType;
36 using content::BrowserThread; 36 using content::BrowserThread;
37 37
38 namespace { 38 namespace {
39 39
40 // The display events use the "systemInfo" prefix. 40 // The display events use the "systemInfo" prefix.
41 const char kSystemInfoEventPrefix[] = "systemInfo"; 41 const char kSystemInfoEventPrefix[] = "systemInfo";
42 // The storage events still use the "experimental.systemInfo" prefix. 42 // The storage events still use the "experimental.systemInfo" prefix.
43 const char kExperimentalSystemInfoEventPrefix[] = "experimental.systemInfo"; 43 const char kExperimentalSystemInfoEventPrefix[] = "experimental.systemInfo";
44 44
45 bool IsDisplayChangedEvent(const std::string& event_name) { 45 bool IsDisplayChangedEvent(const std::string& event_name) {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) { 283 void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) {
284 SystemInfoEventRouter::GetInstance()->AddEventListener(details.event_name); 284 SystemInfoEventRouter::GetInstance()->AddEventListener(details.event_name);
285 } 285 }
286 286
287 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) { 287 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
288 SystemInfoEventRouter::GetInstance()->RemoveEventListener(details.event_name); 288 SystemInfoEventRouter::GetInstance()->RemoveEventListener(details.event_name);
289 } 289 }
290 290
291 } // namespace extensions 291 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698