This commit is contained in:
Cheng Zhao 2015-09-03 20:07:29 +08:00
Родитель c81de98d22
Коммит 53b9d61831
5 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -172,7 +172,7 @@ bool URLRequestAsarJob::IsRedirectResponse(GURL* location,
#if defined(OS_WIN) #if defined(OS_WIN)
// Follow a Windows shortcut. // Follow a Windows shortcut.
// We just resolve .lnk file, ignore others. // We just resolve .lnk file, ignore others.
if (!LowerCaseEqualsASCII(file_path_.Extension(), ".lnk")) if (!base::LowerCaseEqualsASCII(file_path_.Extension(), ".lnk"))
return false; return false;
base::FilePath new_path = file_path_; base::FilePath new_path = file_path_;

Просмотреть файл

@ -252,7 +252,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
bool matched = false; bool matched = false;
for (size_t i = 0; i < filter.second.size(); ++i) { for (size_t i = 0; i < filter.second.size(); ++i) {
if (EndsWith(file_name, filter.second[i], false)) { if (base::EndsWith(file_name, filter.second[i], false)) {
matched = true; matched = true;
break;; break;;
} }

Просмотреть файл

@ -296,8 +296,7 @@ void PdfToEmfUtilityProcessHostClient::Start(
// generate when sent to a metafile DC. // generate when sent to a metafile DC.
utility_process_host_ = utility_process_host_ =
content::UtilityProcessHost::Create( content::UtilityProcessHost::Create(
this, base::MessageLoop::current()->message_loop_proxy()) this, base::MessageLoop::current()->task_runner())->AsWeakPtr();
->AsWeakPtr();
if (!utility_process_host_) if (!utility_process_host_)
return OnFailed(); return OnFailed();
// Should reply with OnProcessStarted(). // Should reply with OnProcessStarted().

Просмотреть файл

@ -27,7 +27,7 @@
#if defined(OS_WIN) #if defined(OS_WIN)
// A vector of filters, each being a Tuple containing a display string (i.e. // A vector of filters, each being a Tuple containing a display string (i.e.
// "Text Files") and a filter pattern (i.e. "*.txt"). // "Text Files") and a filter pattern (i.e. "*.txt").
typedef std::vector<Tuple<base::string16, base::string16>> typedef std::vector<base::Tuple<base::string16, base::string16>>
GetOpenFileNameFilter; GetOpenFileNameFilter;
#endif // OS_WIN #endif // OS_WIN

Просмотреть файл

@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent' 'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = '367552dc926aff4577e4743333922e7e6075c8e0' LIBCHROMIUMCONTENT_COMMIT = 'f5489a774b719e9e979675c17b99ed45a05aacf7'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',