Remove the Activity Log UI

This CL removes the Activity Log UI. I will be replacing it with an extension once the chrome.activityLogPrivate API is complete.

The only code changes in this CL are for code deletion.

BUG=241672

Review URL: https://chromiumcodereview.appspot.com/15812004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202959 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 2 insertions, 380 deletions

diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 4395310..7b7675e 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -517,8 +517,6 @@ IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION
 IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME
 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_DESCRIPTION
 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_NAME
-IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION
-IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME
 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION
 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME
 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 90649a0..25d679c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5514,9 +5514,6 @@ Make sure you do not expose any sensitive information.
       <message name="IDS_EXTENSIONS_PERMISSIONS_LINK" desc="The link text for the Permissions link.">
         Permissions
       </message>
-      <message name="IDS_EXTENSIONS_ACTIVITY_LINK" desc="The link for showing extension activity.">
-        Activity
-      </message>
       <message name="IDS_EXTENSIONS_SHOW_BUTTON" desc="The text for the Show link.">
         Show button
       </message>
@@ -5664,23 +5661,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Hide Details
       </message>
 
-      <!-- chrome://extension-activity page -->
-      <message name="IDS_EXTENSION_ACTIVITY_TITLE" desc="Title for the extension-activity tab.">
-        Extension Activity
-      </message>
-      <message name="IDS_EXTENSION_ACTIVITY_API_CALL" desc="Text for the label next to an activity message that represents a call to the extension API.">
-        API Call
-      </message>
-      <message name="IDS_EXTENSION_ACTIVITY_API_BLOCK" desc="Text for the label next to an activity message that represents a blocked call to the extension API.">
-        Blocked API Call
-      </message>
-      <message name="IDS_EXTENSION_ACTIVITY_CONTENT_SCRIPT" desc="Text for the label next to an activity message that represents a content script injection.">
-        Content Script
-      </message>
-      <message name="IDS_EXTENSION_ACTIVITY_EVENT_DISPATCH" desc="Text for the label next to an activity message that represents an extension event callback.">
-        API Event
-      </message>
-
       <!-- chrome://extension-info bubble -->
       <message name="IDS_EXTENSION_SCRIPT_POPUP_IS_RUNNING" desc="The label in the extension info bubble that indicates the extension is running scripts on this page">
         <ph name="EXTENSION_NAME">$1<ex>AdBlock</ex></ph> is running on this page.
@@ -6891,12 +6871,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_CSS_SHADERS_DESCRIPTION" desc="Description for the flag to enable CSS Shaders.">
         Enable filter effects on DOM elements using custom GLSL shaders. More info at https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#feCustomElement.
       </message>
-      <message name="IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME" desc="Name for the flag to enable the extension activity UI.">
-        Enable extension activity UI
-      </message>
-      <message name="IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION" desc="Description for the flag to enable the extension activity UI.">
-        Enable experimental UI that shows a log of extension activity.
-      </message>
       <message name="IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME" desc="Name for the flag to disable the 'Other devices' menu on the NTP.">
         Disable NTP 'Other devices' menu.
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fa07c5d..e67ae4f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -814,13 +814,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableCssShaders)
   },
   {
-    "enable-extension-activity-ui",
-    IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME,
-    IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION,
-    kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI)
-  },
-  {
     "disable-ntp-other-sessions-menu",
     IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME,
     IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION,
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 68aa8d45..0f4955a 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -114,8 +114,6 @@
       </if>
       <if expr="not is_android">
         <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension_list.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\extension_activity.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\extension_activity.js" flattenhtml="true" type="BINDATA" />
         <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extension_info.css" flattenhtml="true" type="BINDATA" />
         <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\extension_info.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extension_info.js" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index b2980e6..7fc3a4d 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -59,9 +59,7 @@ class LogIsEnabled {
 
   void ComputeIsEnabled() {
     enabled_ = CommandLine::ForCurrentProcess()->
-        HasSwitch(switches::kEnableExtensionActivityLogging) ||
-        CommandLine::ForCurrentProcess()->
-        HasSwitch(switches::kEnableExtensionActivityUI);
+        HasSwitch(switches::kEnableExtensionActivityLogging);
   }
 
   static LogIsEnabled* GetInstance() {
@@ -146,8 +144,6 @@ ActivityLog::ActivityLog(Profile* profile) : profile_(profile) {
   // enable-extension-activity-logging and enable-extension-activity-ui
   log_activity_to_stdout_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableExtensionActivityLogging);
-  log_activity_to_ui_ = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableExtensionActivityUI);
 
   // enable-extension-activity-log-testing
   // This controls whether arguments are collected.
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index f8898f5..10eb34f 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -42,7 +42,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
         ExtensionSystem::Get(profile_))->CreateExtensionService(
             &command_line, base::FilePath(), false);
     CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableExtensionActivityUI);
+        switches::kEnableExtensionActivityLogging);
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
     ActivityLog::RecomputeLoggingIsEnabled();
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 8c932a9..e6b4785 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -1134,7 +1134,6 @@ bool DeveloperPrivateGetStringsFunction::RunImpl() {
   SET_STRING("extensionSettingsLaunch", IDS_EXTENSIONS_LAUNCH);
   SET_STRING("extensionSettingsRestart", IDS_EXTENSIONS_RESTART);
   SET_STRING("extensionSettingsOptions", IDS_EXTENSIONS_OPTIONS_LINK);
-  SET_STRING("extensionSettingsActivity", IDS_EXTENSIONS_ACTIVITY_LINK);
   SET_STRING("extensionSettingsPermissions", IDS_EXTENSIONS_PERMISSIONS_LINK);
   SET_STRING("extensionSettingsVisitWebsite", IDS_EXTENSIONS_VISIT_WEBSITE);
   SET_STRING("extensionSettingsVisitWebStore", IDS_EXTENSIONS_VISIT_WEBSTORE);
diff --git a/chrome/browser/resources/extensions/extension_activity.css b/chrome/browser/resources/extensions/extension_activity.css
deleted file mode 100644
index fb40cdf..0000000
--- a/chrome/browser/resources/extensions/extension_activity.css
+++ /dev/null
@@ -1,17 +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. */
-
-body {
-  -webkit-padding-start: 0.67em;
-}
-
-#extension-activity-list {
-  -webkit-padding-before: 0.67em;
-}
-
-.extension-activity-time,
-.extension-activity-label,
-.extension-activity-message {
-  -webkit-padding-end: 10px;
-}
diff --git a/chrome/browser/resources/extensions/extension_activity.html b/chrome/browser/resources/extensions/extension_activity.html
deleted file mode 100644
index 314e00e..0000000
--- a/chrome/browser/resources/extensions/extension_activity.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html i18n-values="dir:textdirection;" class="loading">
-<head>
-<meta charset="utf-8">
-
-<link rel="icon" href="chrome://theme/IDR_EXTENSIONS_FAVICON">
-<link rel="stylesheet" href="extensions.css">
-<link rel="stylesheet" href="extension_activity.css">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
-
-<script src="chrome://resources/js/cr.js"></script>
-<script src="chrome://resources/js/load_time_data.js"></script>
-<script src="chrome://resources/js/util.js"></script>
-
-<script src="chrome://extension-activity/extension_activity.js"></script>
-</head>
-
-<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
-
-<div class="page" id="extension-settings">
-  <header id="page-header"><h1 i18n-content="extensionActivity"></h1></header>
-  <div class="extension-list-item-wrapper">
-    <div class="extension-list-item">
-      <div class="extension-details">
-        <div>
-          <span class="extension-title"></span>
-          <span class="extension-version"></span>
-        </div>
-        <p class="extension-description"></p>
-      </div>
-    </div>
-  </div>
-  <div id="extension-activity-list"></div>
-</div>
-
-<div id="template-collection" hidden>
-  <div class="extension-activity-labels">
-    <!-- The indices here match the activity enum defined in
-         chrome/browser/extensions/activity_log.h -->
-    <span class="extension-activity-label-0"
-        i18n-content="extensionActivityApiCall"></span>
-    <span class="extension-activity-label-1"
-        i18n-content="extensionActivityApiBlock"></span>
-    <span class="extension-activity-label-2"
-        i18n-content="extensionActivityContentScript"></span>
-    <span class="extension-activity-label-3"
-        i18n-content="extensionActivityEventDispatch"></span>
-  </div>
-
-  <div class="extension-activity-item">
-    <span class="extension-activity-time"></span>
-    <span class="extension-activity-label"></span>
-    <span class="extension-activity-message"></span>
-  </div>
-</div>
-
-<script src="chrome://extension-activity/strings.js"></script>
-<script src="chrome://resources/js/i18n_template2.js"></script>
-
-</body>
-</html>
diff --git a/chrome/browser/resources/extensions/extension_activity.js b/chrome/browser/resources/extensions/extension_activity.js
deleted file mode 100644
index b0f8866..0000000
--- a/chrome/browser/resources/extensions/extension_activity.js
+++ /dev/null
@@ -1,56 +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('extension_activity', function() {
-  'use strict';
-
-  function initialize() {
-    var params = parseQueryParams(location);
-    if (params.extensionId)
-      chrome.send('requestExtensionData', [params.extensionId]);
-  }
-
-  function handleExtensionData(result) {
-    var extension = result.extension;
-
-    var item = document.querySelector('.extension-list-item');
-    item.style.backgroundImage = 'url(' + extension.icon + ')';
-    item.querySelector('.extension-title').textContent = extension.name;
-    item.querySelector('.extension-version').textContent = extension.version;
-    item.querySelector('.extension-description').textContent =
-        extension.description;
-  }
-
-  function handleExtensionActivity(result) {
-    var template = $('template-collection');
-
-    // Clone the activity item template.
-    var item =
-        template.querySelector('.extension-activity-item').cloneNode(true);
-    item.querySelector('.extension-activity-time').textContent =
-        new Date().toLocaleTimeString();
-    item.querySelector('.extension-activity-label').textContent =
-        template.querySelector('.extension-activity-label-' + result.activity)
-            .textContent;
-
-    // Clone the message node and then delete the empty template.
-    var msgNode = item.querySelector('.extension-activity-message');
-    for (var i = 0; i < result.messages.length; ++i) {
-      var newNode = msgNode.cloneNode(true);
-      newNode.textContent = result.messages[i];
-      item.appendChild(newNode);
-    }
-    item.removeChild(msgNode);
-
-    $('extension-activity-list').appendChild(item);
-  }
-
-  return {
-    initialize: initialize,
-    handleExtensionData: handleExtensionData,
-    handleExtensionActivity: handleExtensionActivity
-  };
-});
-
-window.addEventListener('load', extension_activity.initialize);
diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js
index 4a5bdee..ea232a5 100644
--- a/chrome/browser/resources/extensions/extension_list.js
+++ b/chrome/browser/resources/extensions/extension_list.js
@@ -164,23 +164,6 @@ cr.define('options', function() {
         e.preventDefault();
       });
 
-      if (extension.allow_activity) {
-        var activity = node.querySelector('.activity-link');
-        activity.addEventListener('click', function(e) {
-          chrome.send('navigateToUrl', [
-            'chrome://extension-activity?extensionId=' + extension.id,
-            '_blank',
-            e.button,
-            e.altKey,
-            e.ctrlKey,
-            e.metaKey,
-            e.shiftKey
-          ]);
-          e.preventDefault();
-        });
-        activity.hidden = false;
-      }
-
       // The 'View in Web Store/View Web Site' link.
       if (extension.homepageUrl) {
         var siteLink = node.querySelector('.site-link');
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html
index 3c99dc9..da725eb 100644
--- a/chrome/browser/resources/extensions/extensions.html
+++ b/chrome/browser/resources/extensions/extensions.html
@@ -141,8 +141,6 @@
           </label>
           <a class="options-link" i18n-content="extensionSettingsOptions"
               href="#" hidden></a>
-          <a class="activity-link" i18n-content="extensionSettingsActivity"
-              href="#" hidden></a>
           <a class="reload-link" i18n-content="extensionSettingsReloadUnpacked"
               href="#" hidden></a>
           <a class="launch-link" i18n-content="extensionSettingsLaunch"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index ad254cd..87d11372 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/ui/webui/crashes_ui.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "chrome/browser/ui/webui/downloads_ui.h"
-#include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/feedback_ui.h"
@@ -411,11 +410,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   }
 
 #if defined(ENABLE_EXTENSIONS)
-  if (url.host() == chrome::kChromeUIExtensionActivityHost &&
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionActivityUI)) {
-    return &NewWebUI<ExtensionActivityUI>;
-  }
   if (url.host() == chrome::kChromeUIExtensionInfoHost &&
       extensions::FeatureSwitch::script_badges()->IsEnabled()) {
     return &NewWebUI<ExtensionInfoUI>;
diff --git a/chrome/browser/ui/webui/extensions/extension_activity_ui.cc b/chrome/browser/ui/webui/extensions/extension_activity_ui.cc
deleted file mode 100644
index a27e6a5..0000000
--- a/chrome/browser/ui/webui/extensions/extension_activity_ui.cc
+++ /dev/null
@@ -1,117 +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.
-
-#include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
-
-#include "base/bind.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/url_constants.h"
-#include "content/public/browser/web_ui.h"
-#include "content/public/browser/web_ui_data_source.h"
-#include "grit/browser_resources.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-
-ExtensionActivityUI::ExtensionActivityUI(content::WebUI* web_ui)
-    : WebUIController(web_ui), extension_(NULL) {
-  web_ui->OverrideTitle(l10n_util::GetStringUTF16(
-      IDS_EXTENSION_ACTIVITY_TITLE));
-
-  content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(chrome::kChromeUIExtensionActivityHost);
-
-  // Localized strings.
-  source->AddLocalizedString("extensionActivity", IDS_EXTENSION_ACTIVITY_TITLE);
-  source->AddLocalizedString("extensionActivityApiCall",
-                             IDS_EXTENSION_ACTIVITY_API_CALL);
-  source->AddLocalizedString("extensionActivityApiBlock",
-                             IDS_EXTENSION_ACTIVITY_API_BLOCK);
-  source->AddLocalizedString("extensionActivityContentScript",
-                             IDS_EXTENSION_ACTIVITY_CONTENT_SCRIPT);
-  source->AddLocalizedString("extensionActivityEventDispatch",
-                             IDS_EXTENSION_ACTIVITY_EVENT_DISPATCH);
-  source->SetUseJsonJSFormatV2();
-  source->SetJsonPath("strings.js");
-
-  // Resources.
-  source->AddResourcePath("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS);
-  source->SetDefaultResource(IDR_EXTENSION_ACTIVITY_HTML);
-  profile_ = Profile::FromWebUI(web_ui);
-  content::WebUIDataSource::Add(profile_, source);
-  // Callback handlers.
-  web_ui->RegisterMessageCallback("requestExtensionData",
-      base::Bind(&ExtensionActivityUI::HandleRequestExtensionData,
-                 base::Unretained(this)));
-}
-
-ExtensionActivityUI::~ExtensionActivityUI() {
-  if (extension_)
-    extensions::ActivityLog::GetInstance(profile_)->RemoveObserver(
-        extension_, this);
-}
-
-void ExtensionActivityUI::HandleRequestExtensionData(
-    const base::ListValue* args) {
-  DCHECK_EQ(1U, args->GetSize());
-
-  std::string extension_id;
-  if (!args->GetString(0, &extension_id))
-    return;
-
-  ExtensionService* extension_service = profile_->GetExtensionService();
-  extension_ = extension_service->GetExtensionById(extension_id, false);
-  if (!extension_)
-    return;
-
-  GURL icon =
-      ExtensionIconSource::GetIconURL(extension_,
-                                      extension_misc::EXTENSION_ICON_MEDIUM,
-                                      ExtensionIconSet::MATCH_BIGGER,
-                                      false, NULL);
-
-  DictionaryValue* extension_data = new DictionaryValue();  // Owned by result.
-  extension_data->SetString("id", extension_->id());
-  extension_data->SetString("name", extension_->name());
-  extension_data->SetString("version", extension_->version()->GetString());
-  extension_data->SetString("description", extension_->description());
-  extension_data->SetString("icon", icon.spec());
-
-  DictionaryValue result;
-  result.Set("extension", extension_data);
-
-  web_ui()->CallJavascriptFunction("extension_activity.handleExtensionData",
-                                   result);
-
-  extensions::ActivityLog* activity_log =
-      extensions::ActivityLog::GetInstance(profile_);
-  activity_log->GetActions(
-      extension_->id(),
-      0,  // today
-      base::Bind(&ExtensionActivityUI::FetchPreviousExtensionActivity,
-                 base::Unretained(this)));
-  activity_log->AddObserver(extension_, this);
-}
-
-void ExtensionActivityUI::FetchPreviousExtensionActivity(
-    scoped_ptr<std::vector<scoped_refptr<extensions::Action> > > actions) {
-  // TODO(felt): Implement this to display previous activity.
-}
-
-void ExtensionActivityUI::OnExtensionActivity(
-      const extensions::Extension* extension,
-      extensions::ActivityLog::Activity activity,
-      const std::string& message) {
-  scoped_ptr<ListValue> messages_list(new ListValue());
-  messages_list->AppendString(message);
-
-  DictionaryValue result;
-  result.SetInteger("activity", activity);
-  result.Set("messages", messages_list.release());
-
-  web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
-                                   result);
-}
diff --git a/chrome/browser/ui/webui/extensions/extension_activity_ui.h b/chrome/browser/ui/webui/extensions/extension_activity_ui.h
deleted file mode 100644
index bf9f63d..0000000
--- a/chrome/browser/ui/webui/extensions/extension_activity_ui.h
+++ /dev/null
@@ -1,45 +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.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ACTIVITY_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ACTIVITY_UI_H_
-
-#include <string>
-#include <vector>
-#include "chrome/browser/extensions/activity_log/activity_actions.h"
-#include "chrome/browser/extensions/activity_log/activity_log.h"
-#include "content/public/browser/web_ui_controller.h"
-
-namespace extensions {
-class Extension;
-class Action;
-}
-
-class ExtensionActivityUI : public content::WebUIController,
-                            public extensions::ActivityLog::Observer {
- public:
-  explicit ExtensionActivityUI(content::WebUI* web_ui);
-  virtual ~ExtensionActivityUI();
-
-  // Callback for "requestExtensionData".
-  void HandleRequestExtensionData(const base::ListValue* args);
-
-  // Callback for fetching and displaying prior extension history data.
-  void FetchPreviousExtensionActivity(
-    scoped_ptr<std::vector<scoped_refptr<extensions::Action> > > actions);
-
-  // ActivityLog::Observer implementation.
-  virtual void OnExtensionActivity(
-      const extensions::Extension* extension,
-      extensions::ActivityLog::Activity activity,
-      const std::string& message) OVERRIDE;
-
- private:
-  const extensions::Extension* extension_;
-  Profile* profile_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionActivityUI);
-};
-
-#endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ACTIVITY_UI_H_
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 7c7eda2..825e860 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -160,9 +160,6 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
   extension_data->SetBoolean("wantsFileAccess", extension->wants_file_access());
   extension_data->SetBoolean("allowFileAccess",
                              extension_service_->AllowFileAccess(extension));
-  extension_data->SetBoolean("allow_activity",
-      enabled && CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionActivityUI));
   extension_data->SetBoolean("allow_reload",
       Manifest::IsUnpackedLocation(extension->location()));
   extension_data->SetBoolean("is_hosted_app", extension->is_hosted_app());
@@ -308,8 +305,6 @@ void ExtensionSettingsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));
   source->AddString("extensionSettingsPermissions",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));
-  source->AddString("extensionSettingsActivity",
-      l10n_util::GetStringUTF16(IDS_EXTENSIONS_ACTIVITY_LINK));
   source->AddString("extensionSettingsVisitWebsite",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));
   source->AddString("extensionSettingsVisitWebStore",
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 78ca262..b79451f 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2033,8 +2033,6 @@
         'browser/ui/webui/downloads_ui.h',
         'browser/ui/webui/extensions/command_handler.cc',
         'browser/ui/webui/extensions/command_handler.h',
-        'browser/ui/webui/extensions/extension_activity_ui.cc',
-        'browser/ui/webui/extensions/extension_activity_ui.h',
         'browser/ui/webui/extensions/extension_icon_source.cc',
         'browser/ui/webui/extensions/extension_icon_source.h',
         'browser/ui/webui/extensions/extension_info_ui.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3c9165e..533511a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -537,9 +537,6 @@ const char kEnableExtensionActivityLogging[] =
 const char kEnableExtensionActivityLogTesting[] =
     "enable-extension-activity-log-testing";
 
-// Enables the extension activity UI.
-const char kEnableExtensionActivityUI[]     = "enable-extension-activity-ui";
-
 // Enables or disables showing extensions in the action box.
 const char kExtensionsInActionBox[]         = "extensions-in-action-box";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 16dd817..c7acbdc 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -156,7 +156,6 @@ extern const char kEnableDraggableMenuButton[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionActivityLogging[];
 extern const char kEnableExtensionActivityLogTesting[];
-extern const char kEnableExtensionActivityUI[];
 extern const char kEnableFileCookies[];
 extern const char kEnableGoogleNowIntegration[];
 extern const char kEnableInstantExtendedAPI[];
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 05a17d8..f91b2936 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -32,7 +32,6 @@ const char kChromeUICreditsURL[] = "chrome://credits/";
 const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/devtools.html";
 const char kChromeUIDownloadsURL[] = "chrome://downloads/";
 const char kChromeUIEditSearchEngineDialogURL[] = "chrome://editsearchengine/";
-const char kChromeUIExtensionActivityURL[] = "chrome://extension-activity/";
 const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/";
 const char kChromeUIExtensionInfoURL[] = "chrome://extension-info/";
 const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/";
@@ -150,7 +149,6 @@ const char kChromeUIDNSHost[] = "dns";
 const char kChromeUIDownloadsHost[] = "downloads";
 const char kChromeUIDriveInternalsHost[] = "drive-internals";
 const char kChromeUIEditSearchEngineDialogHost[] = "editsearchengine";
-const char kChromeUIExtensionActivityHost[] = "extension-activity";
 const char kChromeUIExtensionIconHost[] = "extension-icon";
 const char kChromeUIExtensionInfoHost[] = "extension-info";
 const char kChromeUIExtensionsFrameHost[] = "extensions-frame";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 4dc273c..8f7ffd2 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -31,7 +31,6 @@ extern const char kChromeUICreditsURL[];
 extern const char kChromeUIDevToolsURL[];
 extern const char kChromeUIDownloadsURL[];
 extern const char kChromeUIEditSearchEngineDialogURL[];
-extern const char kChromeUIExtensionActivityURL[];
 extern const char kChromeUIExtensionIconURL[];
 extern const char kChromeUIExtensionInfoURL[];
 extern const char kChromeUIExtensionsFrameURL[];
@@ -143,7 +142,6 @@ extern const char kChromeUIDNSHost[];
 extern const char kChromeUIDownloadsHost[];
 extern const char kChromeUIDriveInternalsHost[];
 extern const char kChromeUIEditSearchEngineDialogHost[];
-extern const char kChromeUIExtensionActivityHost[];
 extern const char kChromeUIExtensionIconHost[];
 extern const char kChromeUIExtensionInfoHost[];
 extern const char kChromeUIExtensionsFrameHost[];