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

Side by Side Diff: webkit/default_plugin/plugin_database_handler.cc

Issue 2081007: Enable warning 4389 as an error on windows builds. This will make... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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 | « views/controls/table/table_view.cc ('k') | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "webkit/default_plugin/plugin_database_handler.h" 5 #include "webkit/default_plugin/plugin_database_handler.h"
6 6
7 #if defined(USE_SYSTEM_LIBXML) 7 #if defined(USE_SYSTEM_LIBXML)
8 #include <parser.h> 8 #include <parser.h>
9 #include <xpath.h> 9 #include <xpath.h>
10 #else 10 #else
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 138
139 DLOG(INFO) << "Failed to create plugins file " 139 DLOG(INFO) << "Failed to create plugins file "
140 << plugins_file_.c_str() << " Error " 140 << plugins_file_.c_str() << " Error "
141 << ::GetLastError(); 141 << ::GetLastError();
142 NOTREACHED(); 142 NOTREACHED();
143 return 0; 143 return 0;
144 } 144 }
145 } 145 }
146 146
147 unsigned long bytes_written = 0; 147 DWORD bytes_written = 0;
148 if (0 == lstrcmpiA(stream->url, plugin_finder_url_.c_str())) { 148 if (0 == lstrcmpiA(stream->url, plugin_finder_url_.c_str())) {
149 DCHECK(plugin_downloads_file_ != INVALID_HANDLE_VALUE); 149 DCHECK(plugin_downloads_file_ != INVALID_HANDLE_VALUE);
150 150
151 WriteFile(plugin_downloads_file_, buffer, buffer_length, &bytes_written, 151 WriteFile(plugin_downloads_file_, buffer, buffer_length, &bytes_written,
152 NULL); 152 NULL);
153 DCHECK(buffer_length == bytes_written); 153 DCHECK_EQ(buffer_length, static_cast<int32>(bytes_written));
154 } 154 }
155 return bytes_written; 155 return bytes_written;
156 } 156 }
157 157
158 158
159 bool PluginDatabaseHandler::ParsePluginList() { 159 bool PluginDatabaseHandler::ParsePluginList() {
160 if (plugin_downloads_file_ == INVALID_HANDLE_VALUE) { 160 if (plugin_downloads_file_ == INVALID_HANDLE_VALUE) {
161 DLOG(WARNING) << "Invalid plugins file"; 161 DLOG(WARNING) << "Invalid plugins file";
162 NOTREACHED(); 162 NOTREACHED();
163 return false; 163 return false;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 reinterpret_cast<const char*>(plugin_download_url_val->content); 349 reinterpret_cast<const char*>(plugin_download_url_val->content);
350 350
351 SplitString(reinterpret_cast<const char*>(plugin_mime_type_vals->content), 351 SplitString(reinterpret_cast<const char*>(plugin_mime_type_vals->content),
352 kMimeTypeSeparator, &plugin_detail->mime_types); 352 kMimeTypeSeparator, &plugin_detail->mime_types);
353 353
354 plugin_detail->language = 354 plugin_detail->language =
355 reinterpret_cast<const char*>(plugin_lang_val->content); 355 reinterpret_cast<const char*>(plugin_lang_val->content);
356 356
357 return true; 357 return true;
358 } 358 }
OLDNEW
« no previous file with comments | « views/controls/table/table_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698