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

Side by Side Diff: remoting/host/setup/win/auth_code_getter.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « remoting/host/setup/test_util.cc ('k') | remoting/host/shaped_desktop_capturer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "remoting/host/setup/win/auth_code_getter.h" 5 #include "remoting/host/setup/win/auth_code_getter.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "base/win/scoped_bstr.h" 9 #include "base/win/scoped_bstr.h"
10 #include "base/win/scoped_variant.h" 10 #include "base/win/scoped_variant.h"
11 #include "remoting/host/setup/oauth_helper.h" 11 #include "remoting/host/setup/oauth_helper.h"
12 12
13 namespace { 13 namespace {
14 const int kUrlPollIntervalMs = 100; 14 const int kUrlPollIntervalMs = 100;
15 } // namespace remoting 15 } // namespace remoting
16 16
17 namespace remoting { 17 namespace remoting {
18 18
19 AuthCodeGetter::AuthCodeGetter() : 19 AuthCodeGetter::AuthCodeGetter() :
20 browser_(NULL), 20 browser_(nullptr),
21 timer_interval_(base::TimeDelta::FromMilliseconds(kUrlPollIntervalMs)) { 21 timer_interval_(base::TimeDelta::FromMilliseconds(kUrlPollIntervalMs)) {
22 } 22 }
23 23
24 AuthCodeGetter::~AuthCodeGetter() { 24 AuthCodeGetter::~AuthCodeGetter() {
25 KillBrowser(); 25 KillBrowser();
26 } 26 }
27 27
28 void AuthCodeGetter::GetAuthCode( 28 void AuthCodeGetter::GetAuthCode(
29 base::Callback<void(const std::string&)> on_auth_code) { 29 base::Callback<void(const std::string&)> on_auth_code) {
30 if (browser_.get()) { 30 if (browser_.get()) {
31 on_auth_code.Run(""); 31 on_auth_code.Run("");
32 return; 32 return;
33 } 33 }
34 on_auth_code_ = on_auth_code; 34 on_auth_code_ = on_auth_code;
35 HRESULT hr = browser_.CreateInstance(CLSID_InternetExplorer, NULL, 35 HRESULT hr = browser_.CreateInstance(CLSID_InternetExplorer, nullptr,
36 CLSCTX_LOCAL_SERVER); 36 CLSCTX_LOCAL_SERVER);
37 if (FAILED(hr)) { 37 if (FAILED(hr)) {
38 on_auth_code_.Run(""); 38 on_auth_code_.Run("");
39 return; 39 return;
40 } 40 }
41 base::win::ScopedBstr url(base::UTF8ToWide( 41 base::win::ScopedBstr url(base::UTF8ToWide(
42 GetOauthStartUrl(GetDefaultOauthRedirectUrl())).c_str()); 42 GetOauthStartUrl(GetDefaultOauthRedirectUrl())).c_str());
43 base::win::ScopedVariant empty_variant; 43 base::win::ScopedVariant empty_variant;
44 hr = browser_->Navigate(url, empty_variant.AsInput(), empty_variant.AsInput(), 44 hr = browser_->Navigate(url, empty_variant.AsInput(), empty_variant.AsInput(),
45 empty_variant.AsInput(), empty_variant.AsInput()); 45 empty_variant.AsInput(), empty_variant.AsInput());
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 } 86 }
87 87
88 void AuthCodeGetter::KillBrowser() { 88 void AuthCodeGetter::KillBrowser() {
89 if (browser_.get()) { 89 if (browser_.get()) {
90 browser_->Quit(); 90 browser_->Quit();
91 browser_.Release(); 91 browser_.Release();
92 } 92 }
93 } 93 }
94 94
95 } // namespace remoting 95 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/setup/test_util.cc ('k') | remoting/host/shaped_desktop_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698