| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome_frame/chrome_frame_automation.h" | 5 #include "chrome_frame/chrome_frame_automation.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 void ReleaseCallee(ProxyFactory* obj) {} | 157 void ReleaseCallee(ProxyFactory* obj) {} |
| 158 }; | 158 }; |
| 159 | 159 |
| 160 ProxyFactory::ProxyFactory() | 160 ProxyFactory::ProxyFactory() |
| 161 : uma_send_interval_(0) { | 161 : uma_send_interval_(0) { |
| 162 uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval, | 162 uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval, |
| 163 kUmaSendIntervalValue); | 163 kUmaSendIntervalValue); |
| 164 } | 164 } |
| 165 | 165 |
| 166 ProxyFactory::~ProxyFactory() { | 166 ProxyFactory::~ProxyFactory() { |
| 167 DCHECK_EQ(proxies_.container().size(), 0); | 167 for (size_t i = 0; i < proxies_.container().size(); ++i) { |
| 168 if (WAIT_OBJECT_0 != |
| 169 WaitForSingleObject(proxies_[i]->thread->thread_handle(), 0)) |
| 170 // TODO(stoyan): Don't leak proxies on exit. |
| 171 DLOG(ERROR) << "Proxies leaked on exit."; |
| 172 } |
| 168 } | 173 } |
| 169 | 174 |
| 170 void* ProxyFactory::GetAutomationServer(int launch_timeout, | 175 void* ProxyFactory::GetAutomationServer(int launch_timeout, |
| 171 const std::wstring& profile_name, | 176 const std::wstring& profile_name, |
| 172 const std::wstring& extra_argument, | 177 const std::wstring& extra_argument, |
| 173 bool perform_version_check, | 178 bool perform_version_check, |
| 174 LaunchDelegate* delegate) { | 179 LaunchDelegate* delegate) { |
| 175 ProxyCacheEntry* entry = NULL; | 180 ProxyCacheEntry* entry = NULL; |
| 176 // Find already existing launcher thread for given profile | 181 // Find already existing launcher thread for given profile |
| 177 AutoLock lock(lock_); | 182 AutoLock lock(lock_); |
| (...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 if (font_size < SMALLEST_FONT || | 1101 if (font_size < SMALLEST_FONT || |
| 1097 font_size > LARGEST_FONT) { | 1102 font_size > LARGEST_FONT) { |
| 1098 NOTREACHED() << "Invalid font size specified : " | 1103 NOTREACHED() << "Invalid font size specified : " |
| 1099 << font_size; | 1104 << font_size; |
| 1100 return; | 1105 return; |
| 1101 } | 1106 } |
| 1102 | 1107 |
| 1103 Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size)); | 1108 Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size)); |
| 1104 } | 1109 } |
| 1105 | 1110 |
| OLD | NEW |