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

Side by Side Diff: chrome/browser/profile_resetter/brandcode_config_fetcher.h

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 #ifndef CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ 5 #ifndef CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_
6 #define CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ 6 #define CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_
7 7
8 #include <utility>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
11 #include "net/url_request/url_fetcher_delegate.h" 13 #include "net/url_request/url_fetcher_delegate.h"
12 14
13 class BrandcodedDefaultSettings; 15 class BrandcodedDefaultSettings;
14 class GURL; 16 class GURL;
15 17
16 // BrandcodeConfigFetcher fetches and parses the xml containing the brandcoded 18 // BrandcodeConfigFetcher fetches and parses the xml containing the brandcoded
17 // default settings. Caller should provide a FetchCallback. 19 // default settings. Caller should provide a FetchCallback.
18 class BrandcodeConfigFetcher : public net::URLFetcherDelegate { 20 class BrandcodeConfigFetcher : public net::URLFetcherDelegate {
19 public: 21 public:
20 typedef base::Callback<void ()> FetchCallback; 22 typedef base::Callback<void ()> FetchCallback;
21 23
22 BrandcodeConfigFetcher(const FetchCallback& callback, 24 BrandcodeConfigFetcher(const FetchCallback& callback,
23 const GURL& url, 25 const GURL& url,
24 const std::string& brandcode); 26 const std::string& brandcode);
25 ~BrandcodeConfigFetcher() override; 27 ~BrandcodeConfigFetcher() override;
26 28
27 bool IsActive() const { return config_fetcher_; } 29 bool IsActive() const { return config_fetcher_; }
28 30
29 scoped_ptr<BrandcodedDefaultSettings> GetSettings() { 31 scoped_ptr<BrandcodedDefaultSettings> GetSettings() {
30 return default_settings_.Pass(); 32 return std::move(default_settings_);
31 } 33 }
32 34
33 // Sets the new callback. The previous one won't be called. 35 // Sets the new callback. The previous one won't be called.
34 void SetCallback(const FetchCallback& callback); 36 void SetCallback(const FetchCallback& callback);
35 37
36 private: 38 private:
37 // net::URLFetcherDelegate: 39 // net::URLFetcherDelegate:
38 void OnURLFetchComplete(const net::URLFetcher* source) override; 40 void OnURLFetchComplete(const net::URLFetcher* source) override;
39 41
40 void OnDownloadTimeout(); 42 void OnDownloadTimeout();
41 43
42 // Timer that enforces a timeout on the attempt to download the 44 // Timer that enforces a timeout on the attempt to download the
43 // config file. 45 // config file.
44 base::OneShotTimer download_timer_; 46 base::OneShotTimer download_timer_;
45 47
46 // |fetch_callback_| called when fetching succeeded or failed. 48 // |fetch_callback_| called when fetching succeeded or failed.
47 FetchCallback fetch_callback_; 49 FetchCallback fetch_callback_;
48 50
49 // Helper to fetch the online config file. 51 // Helper to fetch the online config file.
50 scoped_ptr<net::URLFetcher> config_fetcher_; 52 scoped_ptr<net::URLFetcher> config_fetcher_;
51 53
52 // Fetched settings. 54 // Fetched settings.
53 scoped_ptr<BrandcodedDefaultSettings> default_settings_; 55 scoped_ptr<BrandcodedDefaultSettings> default_settings_;
54 56
55 DISALLOW_COPY_AND_ASSIGN(BrandcodeConfigFetcher); 57 DISALLOW_COPY_AND_ASSIGN(BrandcodeConfigFetcher);
56 }; 58 };
57 59
58 #endif // CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ 60 #endif // CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698