diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 16:00:34 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 16:00:34 +0000 |
commit | 699e1cd56df7b6f775601c80e99d26f83162a412 (patch) | |
tree | 22d80a14e0ddd552731daac0be3aa2e6dc8bd9ec /chrome/browser/extensions/extensions_ui.h | |
parent | bfae5e6625d0b3cd38d1b7481a12f6a177a2fbde (diff) | |
download | chromium_src-699e1cd56df7b6f775601c80e99d26f83162a412.zip chromium_src-699e1cd56df7b6f775601c80e99d26f83162a412.tar.gz chromium_src-699e1cd56df7b6f775601c80e99d26f83162a412.tar.bz2 |
Eliminate all UI thread decoding of extension images.
Except one, that is. We have one location we need to
take a look at (I've added a comment). This changelist
converts UI usage of DecodeImage on the UI thread to
a revamped and simplified ImageLoadingTracker class.
I plan on adding to GetFilePath a DCHECK for the File
thread but decided to do so in another changelist,
since it has a high likelyhood of flushing something
out and be backed out because of that. This started
out as issue 38521 (make infobar use cached icons)
but grew in scope to just eliminate all UI thread
access to DecodeImage and GetFilePath.
BUG=http://crbug.com/38521
TEST=None (extensions should work as before)
Review URL: http://codereview.chromium.org/1075006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_ui.h')
-rw-r--r-- | chrome/browser/extensions/extensions_ui.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index daf5c2b..8a96c54 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -56,7 +56,7 @@ class ExtensionsUIHTMLSource : public ChromeURLDataManager::DataSource { DISALLOW_COPY_AND_ASSIGN(ExtensionsUIHTMLSource); }; -// The handler for Javascript messages related to the "extensions" view. +// The handler for JavaScript messages related to the "extensions" view. class ExtensionsDOMHandler : public DOMMessageHandler, public NotificationObserver, @@ -201,6 +201,10 @@ class ExtensionsDOMHandler // Called on the UI thread. void OnIconsLoaded(DictionaryValue* json_data); + // Returns the ExtensionInstallUI object for this class, creating it if + // needed. + ExtensionInstallUI* GetExtensionInstallUI(); + // Our model. scoped_refptr<ExtensionsService> extensions_service_; @@ -213,6 +217,10 @@ class ExtensionsDOMHandler // Used to load icons asynchronously on the file thread. scoped_refptr<IconLoader> icon_loader_; + // Used to show confirmation UI for uninstalling/enabling extensions in + // incognito mode. + scoped_ptr<ExtensionInstallUI> install_ui_; + // We monitor changes to the extension system so that we can reload when // necessary. NotificationRegistrar registrar_; |