mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix compilation errors on Linux.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-29 01:51:02 +00:00
parent ad19381217
commit 436deddf68
4 changed files with 4 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/app/atom_main.cc
View file

@ -98,7 +98,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
sandbox::SandboxInterfaceInfo sandbox_info = {0};
content::InitializeSandboxInfo(&sandbox_info);
atom::AtomMainDelegate delegate;
return content::ContentMain(instance, &sandbox_info, &delegate);
return content::ContentMain(content::ContentMainParams(&delegate));
}
#elif defined(OS_LINUX) // defined(OS_WIN)
@ -109,7 +109,7 @@ int main(int argc, const char* argv[]) {
return node::Start(argc, const_cast<char**>(argv));
atom::AtomMainDelegate delegate;
return content::ContentMain(argc, argv, &delegate);
return content::ContentMain(content::ContentMainParams(&delegate));
}
#else // defined(OS_LINUX)

5
atom/browser/ui/gtk/app_indicator_icon.cc
View file

@ -137,13 +137,12 @@ base::FilePath CreateTempImageFile(gfx::ImageSkia* image_ptr,
// Create a new temporary directory for each image since using a single
// temporary directory seems to have issues when changing icons in quick
// succession.
if (!file_util::CreateNewTempDirectory(base::FilePath::StringType(),
&temp_dir))
if (!base::CreateNewTempDirectory(base::FilePath::StringType(), &temp_dir))
return base::FilePath();
new_file_path =
temp_dir.Append(id + base::StringPrintf("_%d.png", icon_change_count));
int bytes_written =
file_util::WriteFile(
base::WriteFile(
new_file_path,
reinterpret_cast<const char*>(png_data->front()),
png_data->size());