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

Side by Side Diff: chrome_frame/chrome_frame_automation.cc

Issue 246027: Reverting 27389. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/interactive_ui/view_event_test_base.h ('k') | chrome_frame/chrome_frame_delegate.h » ('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) 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 138
139 ProxyFactory::ProxyCacheEntry::ProxyCacheEntry(const std::wstring& profile) 139 ProxyFactory::ProxyCacheEntry::ProxyCacheEntry(const std::wstring& profile)
140 : proxy(NULL), profile_name(profile), ref_count(1), 140 : proxy(NULL), profile_name(profile), ref_count(1),
141 launch_result(AutomationLaunchResult(-1)) { 141 launch_result(AutomationLaunchResult(-1)) {
142 thread.reset(new base::Thread(WideToASCII(profile_name).c_str())); 142 thread.reset(new base::Thread(WideToASCII(profile_name).c_str()));
143 thread->Start(); 143 thread->Start();
144 } 144 }
145 145
146 template <> struct RunnableMethodTraits<ProxyFactory> { 146 template <> struct RunnableMethodTraits<ProxyFactory> {
147 static void RetainCallee(ProxyFactory* obj) {} 147 void RetainCallee(ProxyFactory* obj) {}
148 static void ReleaseCallee(ProxyFactory* obj) {} 148 void ReleaseCallee(ProxyFactory* obj) {}
149 }; 149 };
150 150
151 ProxyFactory::ProxyFactory() 151 ProxyFactory::ProxyFactory()
152 : uma_send_interval_(0) { 152 : uma_send_interval_(0) {
153 uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval, 153 uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval,
154 kUmaSendIntervalValue); 154 kUmaSendIntervalValue);
155 } 155 }
156 156
157 ProxyFactory::~ProxyFactory() { 157 ProxyFactory::~ProxyFactory() {
158 DCHECK_EQ(proxies_.container().size(), 0); 158 DCHECK_EQ(proxies_.container().size(), 0);
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 return true; 969 return true;
970 } 970 }
971 971
972 void ChromeFrameAutomationClient::AttachExternalTab( 972 void ChromeFrameAutomationClient::AttachExternalTab(
973 intptr_t external_tab_cookie) { 973 intptr_t external_tab_cookie) {
974 DCHECK(tab_.get() == NULL); 974 DCHECK(tab_.get() == NULL);
975 DCHECK(tab_handle_ == -1); 975 DCHECK(tab_handle_ == -1);
976 976
977 external_tab_cookie_ = external_tab_cookie; 977 external_tab_cookie_ = external_tab_cookie;
978 } 978 }
OLDNEW
« no previous file with comments | « chrome/test/interactive_ui/view_event_test_base.h ('k') | chrome_frame/chrome_frame_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698