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

Side by Side Diff: chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/chromeos/launcher_search_provider/launcher_search_provi der_service.h" 5 #include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provi der_service.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8
8 #include <utility> 9 #include <utility>
9 10
11 #include "base/memory/ptr_util.h"
10 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
11 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provi der_service_factory.h" 14 #include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provi der_service_factory.h"
13 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_prov ider.h" 15 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_prov ider.h"
14 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_resu lt.h" 16 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_resu lt.h"
15 #include "extensions/browser/extension_registry.h" 17 #include "extensions/browser/extension_registry.h"
16 #include "extensions/common/extension_set.h" 18 #include "extensions/common/extension_set.h"
17 #include "extensions/common/permissions/permissions_data.h" 19 #include "extensions/common/permissions/permissions_data.h"
18 20
19 namespace api_launcher_search_provider = 21 namespace api_launcher_search_provider =
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 56
55 extensions::EventRouter* event_router = 57 extensions::EventRouter* event_router =
56 extensions::EventRouter::Get(profile_); 58 extensions::EventRouter::Get(profile_);
57 59
58 CacheListenerExtensionIds(); 60 CacheListenerExtensionIds();
59 for (const ExtensionId extension_id : *cached_listener_extension_ids_.get()) { 61 for (const ExtensionId extension_id : *cached_listener_extension_ids_.get()) {
60 // Convert query_id_ to string here since queryId is defined as string in 62 // Convert query_id_ to string here since queryId is defined as string in
61 // javascript side API while we use uint32_t internally to generate it. 63 // javascript side API while we use uint32_t internally to generate it.
62 event_router->DispatchEventToExtension( 64 event_router->DispatchEventToExtension(
63 extension_id, 65 extension_id,
64 make_scoped_ptr(new extensions::Event( 66 base::WrapUnique(new extensions::Event(
65 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_QUERY_STARTED, 67 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_QUERY_STARTED,
66 api_launcher_search_provider::OnQueryStarted::kEventName, 68 api_launcher_search_provider::OnQueryStarted::kEventName,
67 api_launcher_search_provider::OnQueryStarted::Create( 69 api_launcher_search_provider::OnQueryStarted::Create(
68 query_id_, query, max_result)))); 70 query_id_, query, max_result))));
69 } 71 }
70 } 72 }
71 73
72 void Service::OnQueryEnded() { 74 void Service::OnQueryEnded() {
73 DCHECK(is_query_running_); 75 DCHECK(is_query_running_);
74 provider_ = nullptr; 76 provider_ = nullptr;
75 77
76 extensions::EventRouter* event_router = 78 extensions::EventRouter* event_router =
77 extensions::EventRouter::Get(profile_); 79 extensions::EventRouter::Get(profile_);
78 80
79 CacheListenerExtensionIds(); 81 CacheListenerExtensionIds();
80 for (const ExtensionId extension_id : *cached_listener_extension_ids_.get()) { 82 for (const ExtensionId extension_id : *cached_listener_extension_ids_.get()) {
81 event_router->DispatchEventToExtension( 83 event_router->DispatchEventToExtension(
82 extension_id, 84 extension_id,
83 make_scoped_ptr(new extensions::Event( 85 base::WrapUnique(new extensions::Event(
84 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_QUERY_ENDED, 86 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_QUERY_ENDED,
85 api_launcher_search_provider::OnQueryEnded::kEventName, 87 api_launcher_search_provider::OnQueryEnded::kEventName,
86 api_launcher_search_provider::OnQueryEnded::Create(query_id_)))); 88 api_launcher_search_provider::OnQueryEnded::Create(query_id_))));
87 } 89 }
88 90
89 is_query_running_ = false; 91 is_query_running_ = false;
90 } 92 }
91 93
92 void Service::OnOpenResult(const ExtensionId& extension_id, 94 void Service::OnOpenResult(const ExtensionId& extension_id,
93 const std::string& item_id) { 95 const std::string& item_id) {
94 CacheListenerExtensionIds(); 96 CacheListenerExtensionIds();
95 CHECK(ContainsValue(*cached_listener_extension_ids_.get(), extension_id)); 97 CHECK(ContainsValue(*cached_listener_extension_ids_.get(), extension_id));
96 98
97 extensions::EventRouter* event_router = 99 extensions::EventRouter* event_router =
98 extensions::EventRouter::Get(profile_); 100 extensions::EventRouter::Get(profile_);
99 event_router->DispatchEventToExtension( 101 event_router->DispatchEventToExtension(
100 extension_id, 102 extension_id,
101 make_scoped_ptr(new extensions::Event( 103 base::WrapUnique(new extensions::Event(
102 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_OPEN_RESULT, 104 extensions::events::LAUNCHER_SEARCH_PROVIDER_ON_OPEN_RESULT,
103 api_launcher_search_provider::OnOpenResult::kEventName, 105 api_launcher_search_provider::OnOpenResult::kEventName,
104 api_launcher_search_provider::OnOpenResult::Create(item_id)))); 106 api_launcher_search_provider::OnOpenResult::Create(item_id))));
105 } 107 }
106 108
107 void Service::SetSearchResults( 109 void Service::SetSearchResults(
108 const extensions::Extension* extension, 110 const extensions::Extension* extension,
109 scoped_ptr<ErrorReporter> error_reporter, 111 std::unique_ptr<ErrorReporter> error_reporter,
110 const int query_id, 112 const int query_id,
111 const std::vector<extensions::api::launcher_search_provider::SearchResult>& 113 const std::vector<extensions::api::launcher_search_provider::SearchResult>&
112 results) { 114 results) {
113 // If query is not running or query_id is different from current query id, 115 // If query is not running or query_id is different from current query id,
114 // discard the results. 116 // discard the results.
115 if (!is_query_running_ || query_id != query_id_) 117 if (!is_query_running_ || query_id != query_id_)
116 return; 118 return;
117 119
118 // If |extension| is not in the listener extensions list, ignore it. 120 // If |extension| is not in the listener extensions list, ignore it.
119 CacheListenerExtensionIds(); 121 CacheListenerExtensionIds();
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 extension->permissions_data(); 172 extension->permissions_data();
171 const bool has_permission = permission_data->HasAPIPermission( 173 const bool has_permission = permission_data->HasAPIPermission(
172 extensions::APIPermission::kLauncherSearchProvider); 174 extensions::APIPermission::kLauncherSearchProvider);
173 if (has_permission) 175 if (has_permission)
174 cached_listener_extension_ids_->insert(extension->id()); 176 cached_listener_extension_ids_->insert(extension->id());
175 } 177 }
176 } 178 }
177 179
178 } // namespace launcher_search_provider 180 } // namespace launcher_search_provider
179 } // namespace chromeos 181 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698