diff options
| author | ckehoe <ckehoe@chromium.org> | 2015-02-17 10:42:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-17 18:43:41 +0000 |
| commit | 25eb568df53f2c5c3d406ab7ecfa89702317b169 (patch) | |
| tree | 827631f9b4f3be23fff54178afaa3289bed98d20 | |
| parent | 5e7922a9dcaa760e5a322c6108d529f192a618f6 (diff) | |
| download | chromium_src-25eb568df53f2c5c3d406ab7ecfa89702317b169.zip chromium_src-25eb568df53f2c5c3d406ab7ecfa89702317b169.tar.gz chromium_src-25eb568df53f2c5c3d406ab7ecfa89702317b169.tar.bz2 | |
Fixing copresence/whispernet destructor order
Review URL: https://codereview.chromium.org/923533003
Cr-Commit-Position: refs/heads/master@{#316615}
| -rw-r--r-- | chrome/browser/extensions/api/copresence/copresence_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/copresence/copresence_api.h b/chrome/browser/extensions/api/copresence/copresence_api.h index 83be926..4f82aa6 100644 --- a/chrome/browser/extensions/api/copresence/copresence_api.h +++ b/chrome/browser/extensions/api/copresence/copresence_api.h @@ -104,8 +104,8 @@ class CopresenceService final : public BrowserContextKeyedAPI, std::map<std::string, std::string> api_keys_by_app_; std::map<std::string, std::string> auth_tokens_by_app_; - scoped_ptr<copresence::CopresenceManager> manager_; scoped_ptr<ChromeWhispernetClient> whispernet_client_; + scoped_ptr<copresence::CopresenceManager> manager_; DISALLOW_COPY_AND_ASSIGN(CopresenceService); }; |