diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 18:45:49 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 18:45:49 +0000 |
| commit | ef3facf5d7cae5977657f6ff7dfe3f14746eb08b (patch) | |
| tree | 8b2e7366a054809b55982b7810710e326a708a5b /chrome/browser/history | |
| parent | 3828d6f949346e071e06b10dc47d644510b53392 (diff) | |
| download | chromium_src-ef3facf5d7cae5977657f6ff7dfe3f14746eb08b.zip chromium_src-ef3facf5d7cae5977657f6ff7dfe3f14746eb08b.tar.gz chromium_src-ef3facf5d7cae5977657f6ff7dfe3f14746eb08b.tar.bz2 | |
Add parens around && next to a || to fix build.
BUG=None
TEST="Will it build?"
Review URL: http://codereview.chromium.org/6577023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/in_memory_url_index.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc index 0458699..7cbae31 100644 --- a/chrome/browser/history/in_memory_url_index.cc +++ b/chrome/browser/history/in_memory_url_index.cc @@ -722,9 +722,9 @@ bool InMemoryURLIndex::RestorePrivateData( const InMemoryURLIndexCacheItem& cache) { last_saved_ = base::Time::FromInternalValue(cache.timestamp()); history_item_count_ = cache.history_item_count(); - return (history_item_count_ == 0) || RestoreWordList(cache) && + return (history_item_count_ == 0) || (RestoreWordList(cache) && RestoreWordMap(cache) && RestoreCharWordMap(cache) && - RestoreWordIDHistoryMap(cache) && RestoreHistoryInfoMap(cache); + RestoreWordIDHistoryMap(cache) && RestoreHistoryInfoMap(cache)); } |