Hello steveblock,
I'd like you to do a code review. Please execute
g4 diff -c 9073192
or point your web browser to
http://mondrian/9073192
(this changelist has been uploaded to Mondrian)
to review the following code:
Change 9073192 by [EMAIL PROTECTED] on 2008/11/19 18:18:18 *pending*
Second attempt at safe_http_request.cc build fix.
Ok, the list of safe_http_request.cc users is actually:
* Chrome (NPAPI)
* Opera (NPAPI)
* Android (NPAPI)
* Safari (NPAPI)
* Firefox 2
* Firefox 3
This is covered by having a single $(BROWSER)_CPPSRCS entry
built for all platforms, and changing the include guard to
BROWSER_NPAPI || BROWSER_FF.
PRESUBMIT=passed
R=steveblock
[EMAIL PROTECTED]
DELTA=4 (0 added, 2 deleted, 2 changed)
OCL=9073192
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#212 edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc#17
edit
4 delta lines: 0 added, 2 deleted, 2 changed
Also consider running:
g4 lint -c 9073192
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [EMAIL PROTECTED]
Change 9073192 by [EMAIL PROTECTED] on 2008/11/19 18:18:18 *pending*
Second attempt at safe_http_request.cc build fix.
Ok, the list of safe_http_request.cc users is actually:
* Chrome (NPAPI)
* Opera (NPAPI)
* Android (NPAPI)
* Safari (NPAPI)
* Firefox 2
* Firefox 3
This is covered by having a single $(BROWSER)_CPPSRCS entry
built for all platforms, and changing the include guard to
BROWSER_NPAPI || BROWSER_FF.
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#212 edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc#17
edit
==== //depot/googleclient/gears/opensource/gears/Makefile#212 -
/usr/local/google/home/jripley/gears-trunk/googleclient/gears/opensource/gears/Makefile
====
# action=edit type=text
--- googleclient/gears/opensource/gears/Makefile 2008-11-19
18:18:25.000000000 +0000
+++ googleclient/gears/opensource/gears/Makefile 2008-11-19
18:08:26.000000000 +0000
@@ -2236,7 +2236,6 @@
http_request_ff.cc \
progress_event.cc \
progress_input_stream.cc \
- safe_http_request.cc \
$(NULL)
#-----------------------------------------------------------------------------
@@ -2318,7 +2317,6 @@
localserver_db_proxy.mm \
progress_event.cc \
progress_input_stream.mm \
- safe_http_request.cc \
ui_thread.cc \
$(NULL)
====
//depot/googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc#17
-
/usr/local/google/home/jripley/gears-trunk/googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc
2008-11-19 18:18:25.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/common/safe_http_request.cc
2008-11-19 18:14:42.000000000 +0000
@@ -23,7 +23,7 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifdef BROWSER_NPAPI
+#if defined(BROWSER_NPAPI) || defined(BROWSER_FF)
#include "gears/localserver/common/safe_http_request.h"
@@ -624,4 +624,4 @@
}
}
-#endif // BROWSER_NPAPI
+#endif // defined(BROWSER_NPAPI) || defined(BROWSER_FF)
