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

Side by Side Diff: chrome_frame/chrome_frame_activex_base.h

Issue 3443017: Committing http://codereview.chromium.org/3420004/show for grt@... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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_frame/chrome_frame_activex.cc ('k') | chrome_frame/http_negotiate.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_ACTIVEX_BASE_H_ 5 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ 6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <atlctl.h> 10 #include <atlctl.h>
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 if (!Initialize()) 255 if (!Initialize())
256 return E_OUTOFMEMORY; 256 return E_OUTOFMEMORY;
257 257
258 // Set to true if this is the first launch by this process. 258 // Set to true if this is the first launch by this process.
259 // Used to perform one time tasks. 259 // Used to perform one time tasks.
260 if (g_first_launch_by_process_) { 260 if (g_first_launch_by_process_) {
261 g_first_launch_by_process_ = false; 261 g_first_launch_by_process_ = false;
262 THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.IEVersion", 262 THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.IEVersion",
263 GetIEVersion(), 263 GetIEVersion(),
264 IE_INVALID, 264 IE_INVALID,
265 IE_8, 265 IE_9,
266 IE_8 + 1); 266 IE_9 + 1);
267 } 267 }
268 268
269 return S_OK; 269 return S_OK;
270 } 270 }
271 271
272 void FinalRelease() { 272 void FinalRelease() {
273 Uninitialize(); 273 Uninitialize();
274 } 274 }
275 275
276 void ResetUrlRequestManager() { 276 void ResetUrlRequestManager() {
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 EventHandlers onreadystatechanged_; 1237 EventHandlers onreadystatechanged_;
1238 EventHandlers onprivatemessage_; 1238 EventHandlers onprivatemessage_;
1239 EventHandlers onextensionready_; 1239 EventHandlers onextensionready_;
1240 1240
1241 // Handle network requests when host network stack is used. Passed to the 1241 // Handle network requests when host network stack is used. Passed to the
1242 // automation client on initialization. 1242 // automation client on initialization.
1243 scoped_ptr<UrlmonUrlRequestManager> url_fetcher_; 1243 scoped_ptr<UrlmonUrlRequestManager> url_fetcher_;
1244 }; 1244 };
1245 1245
1246 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ 1246 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/http_negotiate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698