summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 02:18:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 02:18:23 +0000
commit7bff8ce11c4c3833d0b6df245d9269a201995df4 (patch)
tree75b4bdb63de61ae67f7495a8a04ecf0f5c2d36a1
parent81ae0a99d2a8d729c4417d95e622ed5b3fd802a3 (diff)
downloadchromium_src-7bff8ce11c4c3833d0b6df245d9269a201995df4.zip
chromium_src-7bff8ce11c4c3833d0b6df245d9269a201995df4.tar.gz
chromium_src-7bff8ce11c4c3833d0b6df245d9269a201995df4.tar.bz2
Don't show themes in extension config UI. This fixes various bugs
where the extension config UI doesn't work right with themes. This isn't ideal because users go to chrome://extensions/ expecting themes to be listed. If they aren't there, users might be confused. But I don't have an alternate solution. Also, this change removes the error listing from the top of chrome://extensions/. These errors are just getting noisy, I don't think they provide much value. BUG=13649,18456 Review URL: http://codereview.chromium.org/160631 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22578 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/extensions/extensions_ui.cc16
-rw-r--r--chrome/browser/resources/extensions_ui.html10
3 files changed, 6 insertions, 22 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 71476ba..4512f69 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. -->
+without changes to the corresponding grd file. aa1 -->
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/browser_resources.h" type="rc_header">
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 73714f5..57cdae0 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -89,21 +89,15 @@ void ExtensionsDOMHandler::HandleRequestExtensionsData(const Value* value) {
const ExtensionList* extensions = extensions_service_->extensions();
for (ExtensionList::const_iterator extension = extensions->begin();
extension != extensions->end(); ++extension) {
- extensions_list->Append(CreateExtensionDetailValue(
+ // Don't show the themes since this page's UI isn't really useful for
+ // themes.
+ if (!(*extension)->IsTheme()) {
+ extensions_list->Append(CreateExtensionDetailValue(
*extension, GetActivePagesForExtension((*extension)->id())));
+ }
}
results.Set(L"extensions", extensions_list);
- // Add any error log lines to the result structure.
- ListValue *errors_list = new ListValue();
- const std::vector<std::string>* errors =
- ExtensionErrorReporter::GetInstance()->GetErrors();
- for (std::vector<std::string>::const_iterator error = errors->begin();
- error != errors->end(); ++error) {
- errors_list->Append(Value::CreateStringValue(*error));
- }
- results.Set(L"errors", errors_list);
-
dom_ui_->CallJavascriptFunction(L"returnExtensionsData", results);
}
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index eba9e72..8cd383c 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -69,10 +69,6 @@ var extensionDataFormat = {
}
]
}
- ],
- "errors": [
- "something failed to happen",
- "something else failed to happen"
]
};
@@ -246,12 +242,6 @@ th.desc {
<div id="installed-extensions">Installed Extensions</div>
<div id="extensionTemplate">
- <div id="error-box" jsdisplay="errors.length > 0">
- <div id="error-log">Errors</div>
- <div class="error" jsselect="errors" jscontent="$this">
- Error Detail</div>
- </div>
-
<div class="extension-name" jsdisplay="extensions.length === 0">
No Extensions Installed</div>