Index: remoting/host/setup/win/auth_code_getter.cc |
diff --git a/remoting/host/setup/win/auth_code_getter.cc b/remoting/host/setup/win/auth_code_getter.cc |
index 89ce104b8f347a729b8153675b07a076a7a0c19a..3b1c00a6d63702208f60cc8337aa1c24e4ee1a0b 100644 |
--- a/remoting/host/setup/win/auth_code_getter.cc |
+++ b/remoting/host/setup/win/auth_code_getter.cc |
@@ -18,7 +18,6 @@ namespace remoting { |
AuthCodeGetter::AuthCodeGetter() : |
browser_(NULL), |
- browser_running_(false), |
timer_interval_(base::TimeDelta::FromMilliseconds(kUrlPollIntervalMs)) { |
} |
@@ -28,7 +27,7 @@ AuthCodeGetter::~AuthCodeGetter() { |
void AuthCodeGetter::GetAuthCode( |
base::Callback<void(const std::string&)> on_auth_code) { |
- if (browser_running_) { |
+ if (!browser_.IsSameObject(NULL)) { |
alexeypa (please no reviews)
2012/10/30 21:17:35
I believe what you really want is simply:
if (bro
simonmorris
2012/10/30 21:24:37
Done.
|
on_auth_code.Run(""); |
return; |
} |
@@ -39,7 +38,6 @@ void AuthCodeGetter::GetAuthCode( |
on_auth_code_.Run(""); |
return; |
} |
- browser_running_ = true; |
base::win::ScopedBstr url(UTF8ToWide( |
GetOauthStartUrl(GetDefaultOauthRedirectUrl())).c_str()); |
base::win::ScopedVariant empty_variant; |
@@ -69,7 +67,7 @@ void AuthCodeGetter::OnTimer() { |
bool AuthCodeGetter::TestBrowserUrl(std::string* auth_code) { |
*auth_code = ""; |
- if (!browser_running_) { |
+ if (browser_.IsSameObject(NULL)) { |
alexeypa (please no reviews)
2012/10/30 21:17:35
if (!browser_) {
simonmorris
2012/10/30 21:24:37
Done.
|
return true; |
} |
base::win::ScopedBstr url; |
@@ -88,9 +86,9 @@ bool AuthCodeGetter::TestBrowserUrl(std::string* auth_code) { |
} |
void AuthCodeGetter::KillBrowser() { |
- if (browser_running_) { |
+ if (!browser_.IsSameObject(NULL)) { |
alexeypa (please no reviews)
2012/10/30 21:17:35
if (browser_) {
simonmorris
2012/10/30 21:24:37
Done.
|
browser_->Quit(); |
- browser_running_ = false; |
+ browser_.Release(); |
} |
} |