diff options
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_service.h | 2 | ||||
| -rw-r--r-- | chrome/common/render_messages.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h index d9c948b..9d9b6d2 100644 --- a/chrome/common/pref_service.h +++ b/chrome/common/pref_service.h @@ -126,7 +126,7 @@ class PrefService : public NonThreadSafe, FilePath GetFilePath(const wchar_t* path) const; // Returns the branch if it exists. If it's not a branch or the branch does - // not exist, returns NULL. This does + // not exist, returns NULL. const DictionaryValue* GetDictionary(const wchar_t* path) const; const ListValue* GetList(const wchar_t* path) const; diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 07b91a9..257d87e 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -1970,11 +1970,11 @@ struct ParamTraits<ViewMsg_DatabaseOpenFileResponse_Params> { #endif } static bool Read(const Message* m, void** iter, param_type* p) { - return ReadParam(m, iter, &p->file_handle) + bool ret = ReadParam(m, iter, &p->file_handle); #if defined(OS_POSIX) - && ReadParam(m, iter, &p->dir_handle) + ret = ret && ReadParam(m, iter, &p->dir_handle); #endif - ; + return ret; } static void Log(const param_type& p, std::wstring* l) { l->append(L"("); |