Index: chrome/browser/ui/webui/options2/cookies_view_handler2.cc |
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler2.cc b/chrome/browser/ui/webui/options2/cookies_view_handler2.cc |
index e781371519b732936ecd7ed7d69586466a33e403..711233afc6e223b0de94800ceb0992bd5feac5d4 100644 |
--- a/chrome/browser/ui/webui/options2/cookies_view_handler2.cc |
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler2.cc |
@@ -87,6 +87,8 @@ void CookiesViewHandler::GetLocalizedValues( |
IDS_COOKIES_SERVER_BOUND_CERT_CREATED_LABEL }, |
{ "label_server_bound_cert_expires", |
IDS_COOKIES_SERVER_BOUND_CERT_EXPIRES_LABEL }, |
+ { "label_protected_by_apps", |
+ IDS_GEOLOCATION_SET_BY_HOVER }, // TODO(bauerb): Use a better string |
}; |
RegisterStrings(localized_strings, resources, arraysize(resources)); |
@@ -176,6 +178,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() { |
BrowsingDataFileSystemHelper::Create(profile), |
BrowsingDataQuotaHelper::Create(profile), |
BrowsingDataServerBoundCertHelper::Create(profile), |
+ profile->GetExtensionSpecialStoragePolicy(), |
false)); |
cookies_tree_model_->AddCookiesTreeObserver(this); |
} |
@@ -183,13 +186,12 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() { |
void CookiesViewHandler::UpdateSearchResults(const ListValue* args) { |
std::string query; |
- if (!args->GetString(0, &query)) { |
+ if (!args->GetString(0, &query)) |
return; |
- } |
EnsureCookiesTreeModelCreated(); |
- cookies_tree_model_->UpdateSearchResults(UTF8ToWide(query)); |
+ cookies_tree_model_->UpdateSearchResults(UTF8ToUTF16(query)); |
} |
void CookiesViewHandler::RemoveAll(const ListValue* args) { |
@@ -199,9 +201,8 @@ void CookiesViewHandler::RemoveAll(const ListValue* args) { |
void CookiesViewHandler::Remove(const ListValue* args) { |
std::string node_path; |
- if (!args->GetString(0, &node_path)) { |
+ if (!args->GetString(0, &node_path)) |
return; |
- } |
EnsureCookiesTreeModelCreated(); |
@@ -213,9 +214,8 @@ void CookiesViewHandler::Remove(const ListValue* args) { |
void CookiesViewHandler::LoadChildren(const ListValue* args) { |
std::string node_path; |
- if (!args->GetString(0, &node_path)) { |
+ if (!args->GetString(0, &node_path)) |
return; |
- } |
EnsureCookiesTreeModelCreated(); |