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

Side by Side Diff: chrome_frame/chrome_frame_activex_base.h

Issue 523040: Some Chrome Frame cleanup:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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.h ('k') | chrome_frame/chrome_launcher.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) 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 #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>
11 #include <wininet.h>
11 12
12 // Copied min/max defs from windows headers to appease atlimage.h. 13 // Copied min/max defs from windows headers to appease atlimage.h.
13 // TODO(slightlyoff): Figure out of more recent platform SDK's (> 6.1) 14 // TODO(slightlyoff): Figure out of more recent platform SDK's (> 6.1)
14 // undo the janky "#define NOMINMAX" train wreck. See: 15 // undo the janky "#define NOMINMAX" train wreck. See:
15 // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feedback ID=100703 16 // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feedback ID=100703
16 #ifndef max 17 #ifndef max
17 #define max(a,b) (((a) > (b)) ? (a) : (b)) // NOLINT 18 #define max(a,b) (((a) > (b)) ? (a) : (b)) // NOLINT
18 #endif 19 #endif
19 #ifndef min 20 #ifndef min
20 #define min(a,b) (((a) < (b)) ? (a) : (b)) // NOLINT 21 #define min(a,b) (((a) < (b)) ? (a) : (b)) // NOLINT
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 EventHandlers onprivatemessage_; 1131 EventHandlers onprivatemessage_;
1131 EventHandlers onextensionready_; 1132 EventHandlers onextensionready_;
1132 1133
1133 // The UrlmonUrlRequest instance instantiated for downloading the base URL. 1134 // The UrlmonUrlRequest instance instantiated for downloading the base URL.
1134 scoped_refptr<CComObject<UrlmonUrlRequest> > base_url_request_; 1135 scoped_refptr<CComObject<UrlmonUrlRequest> > base_url_request_;
1135 1136
1136 base::Thread worker_thread_; 1137 base::Thread worker_thread_;
1137 }; 1138 };
1138 1139
1139 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ 1140 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_activex.h ('k') | chrome_frame/chrome_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698