diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/cookies_tree_model.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/cookies_tree_model.cc')
| -rw-r--r-- | chrome/browser/cookies_tree_model.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 1dd02be..24e3c9a 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -186,9 +186,10 @@ CookieTreeSessionStorageNode::CookieTreeSessionStorageNode( CookieTreeIndexedDBNode::CookieTreeIndexedDBNode( BrowsingDataIndexedDBHelper::IndexedDBInfo* indexed_db_info) - : CookieTreeNode(indexed_db_info->database_name.empty() ? - l10n_util::GetStringUTF16(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) : - UTF8ToUTF16(indexed_db_info->database_name)), + : CookieTreeNode(UTF8ToUTF16( + indexed_db_info->origin.empty() ? + indexed_db_info->database_identifier : + indexed_db_info->origin)), indexed_db_info_(indexed_db_info) { } |