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

Side by Side Diff: chrome/browser/chromeos/arc/arc_auth_service.h

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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
7 7
8 #include <ostream> 8 #include <ostream>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // communication and shared with Arc OptIn UI platform app. 167 // communication and shared with Arc OptIn UI platform app.
168 content::StoragePartition* storage_partition_ = nullptr; 168 content::StoragePartition* storage_partition_ = nullptr;
169 169
170 // Registrar used to monitor ARC enabled state. 170 // Registrar used to monitor ARC enabled state.
171 PrefChangeRegistrar pref_change_registrar_; 171 PrefChangeRegistrar pref_change_registrar_;
172 172
173 mojo::Binding<AuthHost> binding_; 173 mojo::Binding<AuthHost> binding_;
174 base::ThreadChecker thread_checker_; 174 base::ThreadChecker thread_checker_;
175 State state_ = State::STOPPED; 175 State state_ = State::STOPPED;
176 base::ObserverList<Observer> observer_list_; 176 base::ObserverList<Observer> observer_list_;
177 scoped_ptr<GaiaAuthFetcher> merger_fetcher_; 177 std::unique_ptr<GaiaAuthFetcher> merger_fetcher_;
178 scoped_ptr<UbertokenFetcher> ubertoken_fethcher_; 178 std::unique_ptr<UbertokenFetcher> ubertoken_fethcher_;
179 std::string auth_code_; 179 std::string auth_code_;
180 GetAuthCodeCallback auth_callback_; 180 GetAuthCodeCallback auth_callback_;
181 bool initial_opt_in_ = false; 181 bool initial_opt_in_ = false;
182 bool context_prepared_ = false; 182 bool context_prepared_ = false;
183 UIPage ui_page_ = UIPage::NO_PAGE; 183 UIPage ui_page_ = UIPage::NO_PAGE;
184 base::string16 ui_page_status_; 184 base::string16 ui_page_status_;
185 185
186 DISALLOW_COPY_AND_ASSIGN(ArcAuthService); 186 DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
187 }; 187 };
188 188
189 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state); 189 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
190 190
191 } // namespace arc 191 } // namespace arc
192 192
193 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 193 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_notification.cc ('k') | chrome/browser/chromeos/arc/arc_auth_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698