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

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 11 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 "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h" 5 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h"
6 6
7 #include <utility>
8
7 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
8 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h" 10 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h"
9 #include "chrome/browser/sync_file_system/sync_event_observer.h" 11 #include "chrome/browser/sync_file_system/sync_event_observer.h"
10 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 12 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
11 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" 13 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
12 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 14 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
13 #include "chrome/common/extensions/api/sync_file_system.h" 15 #include "chrome/common/extensions/api/sync_file_system.h"
14 #include "content/public/browser/browser_context.h" 16 #include "content/public/browser/browser_context.h"
15 #include "extensions/browser/event_router.h" 17 #include "extensions/browser/event_router.h"
16 #include "extensions/browser/extension_registry.h" 18 #include "extensions/browser/extension_registry.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 const std::string& description) { 75 const std::string& description) {
74 // Convert state and description into SyncState Object. 76 // Convert state and description into SyncState Object.
75 api::sync_file_system::ServiceInfo service_info; 77 api::sync_file_system::ServiceInfo service_info;
76 service_info.state = SyncServiceStateToExtensionEnum(state); 78 service_info.state = SyncServiceStateToExtensionEnum(state);
77 service_info.description = description; 79 service_info.description = description;
78 scoped_ptr<base::ListValue> params( 80 scoped_ptr<base::ListValue> params(
79 api::sync_file_system::OnServiceStatusChanged::Create(service_info)); 81 api::sync_file_system::OnServiceStatusChanged::Create(service_info));
80 82
81 BroadcastOrDispatchEvent( 83 BroadcastOrDispatchEvent(
82 app_origin, events::SYNC_FILE_SYSTEM_ON_SERVICE_STATUS_CHANGED, 84 app_origin, events::SYNC_FILE_SYSTEM_ON_SERVICE_STATUS_CHANGED,
83 api::sync_file_system::OnServiceStatusChanged::kEventName, params.Pass()); 85 api::sync_file_system::OnServiceStatusChanged::kEventName,
86 std::move(params));
84 } 87 }
85 88
86 void ExtensionSyncEventObserver::OnFileSynced( 89 void ExtensionSyncEventObserver::OnFileSynced(
87 const storage::FileSystemURL& url, 90 const storage::FileSystemURL& url,
88 sync_file_system::SyncFileType file_type, 91 sync_file_system::SyncFileType file_type,
89 sync_file_system::SyncFileStatus status, 92 sync_file_system::SyncFileStatus status,
90 sync_file_system::SyncAction action, 93 sync_file_system::SyncAction action,
91 sync_file_system::SyncDirection direction) { 94 sync_file_system::SyncDirection direction) {
92 scoped_ptr<base::ListValue> params(new base::ListValue()); 95 scoped_ptr<base::ListValue> params(new base::ListValue());
93 96
94 scoped_ptr<base::DictionaryValue> entry( 97 scoped_ptr<base::DictionaryValue> entry(
95 CreateDictionaryValueForFileSystemEntry(url, file_type)); 98 CreateDictionaryValueForFileSystemEntry(url, file_type));
96 if (!entry) 99 if (!entry)
97 return; 100 return;
98 params->Append(entry.release()); 101 params->Append(entry.release());
99 102
100 // Status, SyncAction and any optional notes to go here. 103 // Status, SyncAction and any optional notes to go here.
101 api::sync_file_system::FileStatus status_enum = 104 api::sync_file_system::FileStatus status_enum =
102 SyncFileStatusToExtensionEnum(status); 105 SyncFileStatusToExtensionEnum(status);
103 api::sync_file_system::SyncAction action_enum = 106 api::sync_file_system::SyncAction action_enum =
104 SyncActionToExtensionEnum(action); 107 SyncActionToExtensionEnum(action);
105 api::sync_file_system::SyncDirection direction_enum = 108 api::sync_file_system::SyncDirection direction_enum =
106 SyncDirectionToExtensionEnum(direction); 109 SyncDirectionToExtensionEnum(direction);
107 params->AppendString(api::sync_file_system::ToString(status_enum)); 110 params->AppendString(api::sync_file_system::ToString(status_enum));
108 params->AppendString(api::sync_file_system::ToString(action_enum)); 111 params->AppendString(api::sync_file_system::ToString(action_enum));
109 params->AppendString(api::sync_file_system::ToString(direction_enum)); 112 params->AppendString(api::sync_file_system::ToString(direction_enum));
110 113
111 BroadcastOrDispatchEvent( 114 BroadcastOrDispatchEvent(
112 url.origin(), events::SYNC_FILE_SYSTEM_ON_FILE_STATUS_CHANGED, 115 url.origin(), events::SYNC_FILE_SYSTEM_ON_FILE_STATUS_CHANGED,
113 api::sync_file_system::OnFileStatusChanged::kEventName, params.Pass()); 116 api::sync_file_system::OnFileStatusChanged::kEventName,
117 std::move(params));
114 } 118 }
115 119
116 void ExtensionSyncEventObserver::BroadcastOrDispatchEvent( 120 void ExtensionSyncEventObserver::BroadcastOrDispatchEvent(
117 const GURL& app_origin, 121 const GURL& app_origin,
118 events::HistogramValue histogram_value, 122 events::HistogramValue histogram_value,
119 const std::string& event_name, 123 const std::string& event_name,
120 scoped_ptr<base::ListValue> values) { 124 scoped_ptr<base::ListValue> values) {
121 // Check to see whether the event should be broadcasted to all listening 125 // Check to see whether the event should be broadcasted to all listening
122 // extensions or sent to a specific extension ID. 126 // extensions or sent to a specific extension ID.
123 bool broadcast_mode = app_origin.is_empty(); 127 bool broadcast_mode = app_origin.is_empty();
124 EventRouter* event_router = EventRouter::Get(browser_context_); 128 EventRouter* event_router = EventRouter::Get(browser_context_);
125 DCHECK(event_router); 129 DCHECK(event_router);
126 130
127 scoped_ptr<Event> event( 131 scoped_ptr<Event> event(
128 new Event(histogram_value, event_name, values.Pass())); 132 new Event(histogram_value, event_name, std::move(values)));
129 event->restrict_to_browser_context = browser_context_; 133 event->restrict_to_browser_context = browser_context_;
130 134
131 // No app_origin, broadcast to all listening extensions for this event name. 135 // No app_origin, broadcast to all listening extensions for this event name.
132 if (broadcast_mode) { 136 if (broadcast_mode) {
133 event_router->BroadcastEvent(event.Pass()); 137 event_router->BroadcastEvent(std::move(event));
134 return; 138 return;
135 } 139 }
136 140
137 // Dispatch to single extension ID. 141 // Dispatch to single extension ID.
138 const std::string extension_id = GetExtensionId(app_origin); 142 const std::string extension_id = GetExtensionId(app_origin);
139 if (extension_id.empty()) 143 if (extension_id.empty())
140 return; 144 return;
141 event_router->DispatchEventToExtension(extension_id, event.Pass()); 145 event_router->DispatchEventToExtension(extension_id, std::move(event));
142 } 146 }
143 147
144 template <> 148 template <>
145 void BrowserContextKeyedAPIFactory< 149 void BrowserContextKeyedAPIFactory<
146 ExtensionSyncEventObserver>::DeclareFactoryDependencies() { 150 ExtensionSyncEventObserver>::DeclareFactoryDependencies() {
147 DependsOn(sync_file_system::SyncFileSystemServiceFactory::GetInstance()); 151 DependsOn(sync_file_system::SyncFileSystemServiceFactory::GetInstance());
148 DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); 152 DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
149 } 153 }
150 154
151 } // namespace extensions 155 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698