diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 13:07:11 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 13:07:11 +0000 |
commit | f4605dc056f8a70758f67157ff1811e5d4d3cfa1 (patch) | |
tree | aa87fb43cae5174e52d88b26117986a3191bfbbd /win8 | |
parent | 3c37f473f91d0d07a6b6bd4d0692a130394c1270 (diff) | |
download | chromium_src-f4605dc056f8a70758f67157ff1811e5d4d3cfa1.zip chromium_src-f4605dc056f8a70758f67157ff1811e5d4d3cfa1.tar.gz chromium_src-f4605dc056f8a70758f67157ff1811e5d4d3cfa1.tar.bz2 |
Fix Win Aura use of WeakPtr<T>'s operator T* conversion
BUG=245942
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/16094016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
-rw-r--r-- | win8/test/open_with_dialog_controller.cc | 4 | ||||
-rw-r--r-- | win8/test/ui_automation_client.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win8/test/open_with_dialog_controller.cc b/win8/test/open_with_dialog_controller.cc index 1524a0d..27b8e2d 100644 --- a/win8/test/open_with_dialog_controller.cc +++ b/win8/test/open_with_dialog_controller.cc @@ -238,7 +238,7 @@ OpenWithDialogController::OpenWithDialogController() {} OpenWithDialogController::~OpenWithDialogController() { // Orphan the context if this instance is being destroyed before the context // finishes its work. - if (context_) + if (context_.get()) context_->Orphan(); } @@ -247,7 +247,7 @@ void OpenWithDialogController::Begin( const string16& url_protocol, const string16& program, const SetDefaultCallback& callback) { - DCHECK_EQ(context_, static_cast<Context*>(NULL)); + DCHECK_EQ(context_.get(), static_cast<Context*>(NULL)); if (base::win::GetVersion() < base::win::VERSION_WIN8) { NOTREACHED() << "Windows 8 is required."; // The callback may not properly handle being run from Begin, so post a task diff --git a/win8/test/ui_automation_client.cc b/win8/test/ui_automation_client.cc index ef742f2..4d9605f 100644 --- a/win8/test/ui_automation_client.cc +++ b/win8/test/ui_automation_client.cc @@ -606,7 +606,7 @@ void UIAutomationClient::Begin(const wchar_t* class_name, const InitializedCallback& init_callback, const ResultCallback& result_callback) { DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK_EQ(context_, static_cast<Context*>(NULL)); + DCHECK_EQ(context_.get(), static_cast<Context*>(NULL)); // Start the automation thread and initialize our automation client on it. context_ = Context::Create(); |