8 files changed, 0 insertions, 107 deletions
diff --git a/chrome/browser/resources/options/cookies_list.js b/chrome/browser/resources/options/cookies_list.js
index 4904aed..f6d964c 100644
--- a/chrome/browser/resources/options/cookies_list.js
+++ b/chrome/browser/resources/options/cookies_list.js
@@ -146,11 +146,6 @@ cr.define('options', function() {
       this.infoChild.className = 'cookie-details';
       this.infoChild.hidden = true;
 
-      if (this.origin.data.appId) {
-        this.siteChild.classList.add('app-cookie-site');
-        this.itemsChild.classList.add('app-cookie-items');
-      }
-
       var remove = this.ownerDocument.createElement('button');
       remove.textContent = loadTimeData.getString('remove_cookie');
       remove.onclick = this.removeCookie_.bind(this);
diff --git a/chrome/browser/resources/options/cookies_view.css b/chrome/browser/resources/options/cookies_view.css
index 99d24e8..ab7a62c 100644
--- a/chrome/browser/resources/options/cookies_view.css
+++ b/chrome/browser/resources/options/cookies_view.css
@@ -196,17 +196,3 @@ list.cookie-list > .deletable-item[selected] .cookie-details {
 .cookie-details-value {
   word-wrap: break-word;
 }
-
-
-/* Styles specific to the app cookies window */
-#app-cookies-site-column {
-  width: 20em;
-}
-
-.app-cookie-site {
-  width: 20em;
-}
-
-.app-cookie-items {
-  -webkit-margin-start: 20em;
-}
diff --git a/chrome/browser/resources/options/cookies_view.js b/chrome/browser/resources/options/cookies_view.js
index f42b1f5..fec6311 100644
--- a/chrome/browser/resources/options/cookies_view.js
+++ b/chrome/browser/resources/options/cookies_view.js
@@ -99,10 +99,6 @@ cr.define('options', function() {
       if (!this.visible)
         return;
 
-      // Inform the CookiesViewHandler whether we are operating in regular
-      // cookies dialog or the apps one.
-      chrome.send('setViewContext', [this.isAppContext()]);
-
       chrome.send('reloadCookies');
 
       if (!this.initialized_) {
@@ -114,10 +110,6 @@ cr.define('options', function() {
 
       this.pageDiv.querySelector('.cookies-search-box').focus();
     },
-
-    isAppContext: function() {
-      return false;
-    },
   };
 
   // CookiesViewHandler callbacks.
diff --git a/chrome/browser/resources/options/cookies_view_app.html b/chrome/browser/resources/options/cookies_view_app.html
deleted file mode 100644
index d28e8be..0000000
--- a/chrome/browser/resources/options/cookies_view_app.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="app-cookies-view-page" class="page cookies-view-page" hidden>
-  <div class="close-button"></div>
-  <h1 i18n-content="appCookiesViewPage"></h1>
-  <div class="content-area cookies-list-content-area">
-    <div class="cookies-column-headers">
-      <div id="app-cookies-site-column" class="cookies-site-column">
-        <h3 i18n-content="cookie_domain"></h3>
-      </div>
-      <div class="cookies-data-column">
-        <h3 i18n-content="cookie_local_data"></h3>
-      </div>
-      <div class="cookies-header-controls">
-        <button class="remove-all-cookies-button" 
-            i18n-content="remove_all_cookie"></button>
-        <input class="cookies-search-box" type="search" 
-            i18n-values="placeholder:search_cookies" incremental>
-      </div>
-    </div>
-    <list id="app-cookies-list" class="cookies-list"></list>
-  </div>
-  <div class="action-area">
-    <div class="button-strip">
-      <button class="cookies-view-overlay-confirm" i18n-content="done"></button>
-    </div>
-  </div>
-</div>
diff --git a/chrome/browser/resources/options/cookies_view_app.js b/chrome/browser/resources/options/cookies_view_app.js
deleted file mode 100644
index b9ee641..0000000
--- a/chrome/browser/resources/options/cookies_view_app.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-cr.define('options', function() {
-
-  /////////////////////////////////////////////////////////////////////////////
-  // CookiesViewApp class:
-
-  /**
-   * Encapsulated handling of app cookies and other data page. It
-   * derives from the regular CookiesView.
-   * @constructor
-   */
-  function CookiesViewApp(model) {
-    options.OptionsPage.call(this, 'app-cookies',
-                             loadTimeData.getString('cookiesViewPageTabTitle'),
-                             'app-cookies-view-page');
-  }
-
-  cr.addSingletonGetter(CookiesViewApp);
-
-  CookiesViewApp.prototype = {
-    __proto__: options.CookiesView.prototype,
-
-    isAppContext: function() {
-      return true;
-    },
-  };
-
-  // CookiesViewHandler callbacks.
-  CookiesViewApp.onTreeItemAdded = function(args) {
-    $('app-cookies-list').addByParentId(args[0], args[1], args[2]);
-  };
-
-  CookiesViewApp.onTreeItemRemoved = function(args) {
-    $('app-cookies-list').removeByParentId(args[0], args[1], args[2]);
-  };
-
-  CookiesViewApp.loadChildren = function(args) {
-    $('app-cookies-list').loadChildren(args[0], args[1]);
-  };
-
-  // Export
-  return {
-    CookiesViewApp: CookiesViewApp
-  };
-});
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 703c2de..ebe6910 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -125,7 +125,6 @@
   <include src="autofill_edit_creditcard_overlay.html">
   <include src="content_settings_exceptions_area.html">
   <include src="cookies_view.html">
-  <include src="cookies_view_app.html">
   <include src="handler_options.html">
   <include src="language_add_language_overlay.html">
   <if expr="not is_macosx">
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 34906d5..a98ff65 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -13,7 +13,6 @@ var ConfirmDialog = options.ConfirmDialog;
 var ContentSettingsExceptionsArea =
     options.contentSettings.ContentSettingsExceptionsArea;
 var ContentSettings = options.ContentSettings;
-var CookiesViewApp = options.CookiesViewApp;
 var CookiesView = options.CookiesView;
 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;
 var FactoryResetOverlay = options.FactoryResetOverlay;
@@ -118,9 +117,6 @@ function load() {
                               ContentSettings.getInstance(),
                               [$('privacyContentSettingsButton'),
                                $('show-cookies-button')]);
-  OptionsPage.registerOverlay(CookiesViewApp.getInstance(),
-                              ContentSettings.getInstance(),
-                              [$('privacyContentSettingsButton')]);
   if (!cr.isMac) {
     OptionsPage.registerOverlay(EditDictionaryOverlay.getInstance(),
                                 LanguageOptions.getInstance(),
diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js
index e2c305f..7fab323 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -71,7 +71,6 @@
 <include src="content_settings_ui.js"></include>
 <include src="cookies_list.js"></include>
 <include src="cookies_view.js"></include>
-<include src="cookies_view_app.js"></include>
 <include src="factory_reset_overlay.js"></include>
 <include src="managed_user_settings.js"></include>
 <include src="font_settings.js"></include>