Merge pull request #2680 from darktears/master

Fix Windows build.
crosswalk-project · Dec 2, 2014 · 8689eaa · 8689eaa
2 parents e4d7966 + 9e49f31
commit 8689eaa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/runtime/browser/runtime_ui_delegate.cc b/runtime/browser/runtime_ui_delegate.cc
@@ -21,7 +21,7 @@ namespace {
 const int kDefaultWidth = 840;
 const int kDefaultHeight = 600;
 
-NativeAppWindow* CreateWindow(
+NativeAppWindow* RuntimeCreateWindow(
  Runtime* runtime, const NativeAppWindow::CreateParams& params) {
  NativeAppWindow* window = NativeAppWindow::Create(params);
  // FIXME : Pass an App icon in params.
@@ -76,7 +76,7 @@ void DefaultRuntimeUIDelegate::Show() {
  window_params_.bounds = gfx::Rect(0, 0, kDefaultWidth, kDefaultHeight);
  window_params_.delegate = this;
  window_params_.web_contents = runtime_->web_contents();
- window_ = CreateWindow(runtime_, window_params_);
+ window_ = RuntimeCreateWindow(runtime_, window_params_);
  }
  window_->Show();
 #else

diff --git a/runtime/browser/xwalk_browser_context.cc b/runtime/browser/xwalk_browser_context.cc
@@ -203,7 +203,11 @@ XWalkBrowserContext::GetURLRequestContextGetterById(
  const std::string& pkg_id) {
  for (PartitionPathContextGetterMap::iterator it = context_getters_.begin();
  it != context_getters_.end(); ++it) {
+#if defined(OS_WIN)
+ if (it->first.find(base::UTF8ToWide(pkg_id)))
+#else
  if (it->first.find(pkg_id))
+#endif
  return it->second.get();
  }
  return 0;