Index: cloud_print/service/win/cloud_print_service_config.cc |
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc |
index 278c0dcf42033d12299f4a72622a7825ab69db9c..bfb4af9b07f7b28d2d88c9baad3bf869d884fe68 100644 |
--- a/cloud_print/service/win/cloud_print_service_config.cc |
+++ b/cloud_print/service/win/cloud_print_service_config.cc |
@@ -17,7 +17,7 @@ |
#include "base/threading/thread.h" |
#include "chrome/common/chrome_constants.h" |
#include "cloud_print/common/win/cloud_print_utils.h" |
-#include "cloud_print/resources.h" |
+#include "cloud_print/service/resources.h" |
#include "cloud_print/service/service_state.h" |
#include "cloud_print/service/win/chrome_launcher.h" |
#include "cloud_print/service/win/service_controller.h" |
@@ -297,7 +297,8 @@ base::string16 SetupDialog::GetDlgItemText(int id) const { |
const ATL::CWindow& item = GetDlgItem(id); |
size_t length = item.GetWindowTextLength(); |
base::string16 result(length + 1, L'\0'); |
- result.resize(item.GetWindowText(&result[0], result.size())); |
+ result.resize(item.GetWindowText(&result[0], |
+ static_cast<int>(result.size()))); |
return result; |
} |
@@ -396,7 +397,7 @@ void SetupDialog::Install(const base::string16& user, |
return ShowError(IDS_ERROR_FAILED_CREATE_CONFIG); |
size_t written = base::WriteFile(file, contents.c_str(), |
- contents.size()); |
+ static_cast<int>(contents.size())); |
if (written != contents.size()) { |
DWORD last_error = GetLastError(); |
if (!last_error) |