| Index: chrome/browser/ui/webui/cookies_tree_model_util.cc
|
| diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
|
| index ff1f6108d9e32824565e4f3566aa9d5927400e3f..83aaf4940fe713b36e00a2d311de611c13ec0bec 100644
|
| --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
|
| +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
|
| @@ -15,7 +15,6 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/browsing_data/cookies_tree_model.h"
|
| #include "content/public/browser/indexed_db_context.h"
|
| -#include "extensions/common/extension_set.h"
|
| #include "grit/generated_resources.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| #include "net/ssl/ssl_client_cert_type.h"
|
| @@ -23,6 +22,10 @@
|
| #include "ui/base/text/bytes_formatting.h"
|
| #include "webkit/common/fileapi/file_system_types.h"
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| +#include "extensions/common/extension_set.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| const char kKeyId[] = "id";
|
| @@ -31,7 +34,9 @@ const char kKeyIcon[] = "icon";
|
| const char kKeyType[] = "type";
|
| const char kKeyHasChildren[] = "hasChildren";
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| const char kKeyAppsProtectingThis[] = "appsProtectingThis";
|
| +#endif
|
| const char kKeyName[] = "name";
|
| const char kKeyContent[] = "content";
|
| const char kKeyDomain[] = "domain";
|
| @@ -269,6 +274,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
|
| break;
|
| }
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| const extensions::ExtensionSet* protecting_apps =
|
| node.GetModel()->ExtensionsProtectingNode(node);
|
| if (protecting_apps && !protecting_apps->is_empty()) {
|
| @@ -282,6 +288,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
|
| }
|
| dict->Set(kKeyAppsProtectingThis, app_infos);
|
| }
|
| +#endif
|
|
|
| return true;
|
| }
|
|
|