| OLD | NEW |
| 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 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ | 5 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ |
| 6 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ | 6 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ |
| 7 | 7 |
| 8 #include <atlbase.h> | 8 #include <atlbase.h> |
| 9 #include <atlwin.h> | 9 #include <atlwin.h> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 LaunchDelegate* delegate); | 219 LaunchDelegate* delegate); |
| 220 | 220 |
| 221 ~AutomationProxyCacheEntry(); | 221 ~AutomationProxyCacheEntry(); |
| 222 | 222 |
| 223 void AddDelegate(LaunchDelegate* delegate); | 223 void AddDelegate(LaunchDelegate* delegate); |
| 224 void RemoveDelegate(LaunchDelegate* delegate, base::WaitableEvent* done, | 224 void RemoveDelegate(LaunchDelegate* delegate, base::WaitableEvent* done, |
| 225 bool* was_last_delegate); | 225 bool* was_last_delegate); |
| 226 | 226 |
| 227 DWORD WaitForThread(DWORD timeout) { // NOLINT | 227 DWORD WaitForThread(DWORD timeout) { // NOLINT |
| 228 DCHECK(thread_.get()); | 228 DCHECK(thread_.get()); |
| 229 return ::WaitForSingleObject(thread_->thread_handle(), timeout); | 229 return ::WaitForSingleObject(thread_->thread_handle().platform_handle(), |
| 230 timeout); |
| 230 } | 231 } |
| 231 | 232 |
| 232 bool IsSameProfile(const std::wstring& name) const { | 233 bool IsSameProfile(const std::wstring& name) const { |
| 233 return lstrcmpiW(name.c_str(), profile_name.c_str()) == 0; | 234 return lstrcmpiW(name.c_str(), profile_name.c_str()) == 0; |
| 234 } | 235 } |
| 235 | 236 |
| 236 base::Thread* thread() const { | 237 base::Thread* thread() const { |
| 237 return thread_.get(); | 238 return thread_.get(); |
| 238 } | 239 } |
| 239 | 240 |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 // set to true if the host needs to get notified of all top level navigations | 511 // set to true if the host needs to get notified of all top level navigations |
| 511 // in this page. This typically applies to hosts which would render the new | 512 // in this page. This typically applies to hosts which would render the new |
| 512 // page without chrome frame. Defaults to false. | 513 // page without chrome frame. Defaults to false. |
| 513 bool route_all_top_level_navigations_; | 514 bool route_all_top_level_navigations_; |
| 514 | 515 |
| 515 friend class BeginNavigateContext; | 516 friend class BeginNavigateContext; |
| 516 friend class CreateExternalTabContext; | 517 friend class CreateExternalTabContext; |
| 517 }; | 518 }; |
| 518 | 519 |
| 519 #endif // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ | 520 #endif // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ |
| OLD | NEW |