summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_theme_provider.cc14
-rw-r--r--chrome/browser/browser_theme_provider.h11
-rw-r--r--chrome/browser/chromeos/compact_navigation_bar.cc1
-rwxr-xr-xchrome/browser/chromeos/status_area_view.cc1
-rw-r--r--chrome/browser/cocoa/bookmark_bar_controller.mm1
-rw-r--r--chrome/browser/dom_ui/dom_ui.cc1
-rw-r--r--chrome/browser/extensions/gtk_theme_installed_infobar_delegate.cc2
-rw-r--r--chrome/browser/extensions/theme_installed_infobar_delegate.cc23
-rw-r--r--chrome/browser/extensions/theme_installed_infobar_delegate.h6
-rw-r--r--chrome/browser/gtk/tabs/dragged_tab_gtk.cc1
-rw-r--r--chrome/browser/profile.cc4
-rw-r--r--chrome/browser/profile.h4
-rw-r--r--chrome/browser/views/bookmark_menu_button.cc1
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.cc1
-rw-r--r--chrome/browser/views/frame/browser_frame_win.cc1
-rw-r--r--chrome/test/testing_profile.h2
16 files changed, 44 insertions, 30 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 338e42e..ae08fa8 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -179,7 +179,8 @@ bool BrowserThemeProvider::IsThemeableImage(int resource_id) {
BrowserThemeProvider::BrowserThemeProvider()
: rb_(ResourceBundle::GetSharedInstance()),
- profile_(NULL) {
+ profile_(NULL),
+ number_of_infobars_(0) {
// Initialize the themeable image map so we can use it on other threads.
HasThemeableImage(0);
}
@@ -572,3 +573,14 @@ void BrowserThemeProvider::BuildFromExtension(Extension* extension) {
SavePackName(pack_path);
theme_pack_ = pack;
}
+
+void BrowserThemeProvider::OnInfobarDisplayed() {
+ number_of_infobars_++;
+}
+
+void BrowserThemeProvider::OnInfobarDestroyed() {
+ number_of_infobars_--;
+
+ if (number_of_infobars_ == 0)
+ RemoveUnusedThemes();
+}
diff --git a/chrome/browser/browser_theme_provider.h b/chrome/browser/browser_theme_provider.h
index e6275d6..756e2bc 100644
--- a/chrome/browser/browser_theme_provider.h
+++ b/chrome/browser/browser_theme_provider.h
@@ -129,6 +129,14 @@ class BrowserThemeProvider : public NonThreadSafe,
// locally customized.)
std::string GetThemeID() const;
+ // This class needs to keep track of the number of theme infobars so that we
+ // clean up unused themes.
+ void OnInfobarDisplayed();
+
+ // Decrements the number of theme infobars. If the last infobar has been
+ // destroyed, uninstalls all themes that aren't the currently selected.
+ void OnInfobarDestroyed();
+
// Convert a bitfield alignment into a string like "top left". Public so that
// it can be used to generate CSS values. Takes a bitfield of AlignmentMasks.
static std::string AlignmentToString(int alignment);
@@ -215,6 +223,9 @@ class BrowserThemeProvider : public NonThreadSafe,
scoped_refptr<BrowserThemePack> theme_pack_;
+ // The number of infobars currently displayed.
+ int number_of_infobars_;
+
DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
};
diff --git a/chrome/browser/chromeos/compact_navigation_bar.cc b/chrome/browser/chromeos/compact_navigation_bar.cc
index 7d16b86..ddd1443 100644
--- a/chrome/browser/chromeos/compact_navigation_bar.cc
+++ b/chrome/browser/chromeos/compact_navigation_bar.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
#include "chrome/browser/back_forward_menu_model_views.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/chromeos/status_area_view.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/chromeos/status_area_view.cc b/chrome/browser/chromeos/status_area_view.cc
index bb58e11..c4edc79 100755
--- a/chrome/browser/chromeos/status_area_view.cc
+++ b/chrome/browser/chromeos/status_area_view.cc
@@ -13,6 +13,7 @@
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/chromeos/clock_menu_button.h"
#include "chrome/browser/chromeos/language_menu_button.h"
#include "chrome/browser/chromeos/network_menu_button.h"
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index a46584f..e02aaf5 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -10,6 +10,7 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_theme_provider.h"
#import "chrome/browser/cocoa/background_gradient_view.h"
#import "chrome/browser/cocoa/bookmark_bar_bridge.h"
#import "chrome/browser/cocoa/bookmark_bar_constants.h"
diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc
index 34c5956..5017a9f 100644
--- a/chrome/browser/dom_ui/dom_ui.cc
+++ b/chrome/browser/dom_ui/dom_ui.cc
@@ -9,6 +9,7 @@
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "base/values.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
diff --git a/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.cc b/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.cc
index efca805..d3fc1c0 100644
--- a/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.cc
@@ -16,8 +16,6 @@ GtkThemeInstalledInfoBarDelegate::GtkThemeInstalledInfoBarDelegate(
}
bool GtkThemeInstalledInfoBarDelegate::Cancel() {
- was_canceled_ = true;
-
if (previous_use_gtk_theme_) {
profile()->SetNativeTheme();
return true;
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index caea07d..07072c0 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -7,6 +7,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/string_util.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
@@ -18,28 +19,17 @@ ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
TabContents* tab_contents, const Extension* new_theme,
const std::string& previous_theme_id)
: ConfirmInfoBarDelegate(tab_contents),
- was_canceled_(false),
profile_(tab_contents->profile()),
name_(new_theme->name()),
- new_theme_id_(new_theme->id()),
previous_theme_id_(previous_theme_id) {
+ profile_->GetThemeProvider()->OnInfobarDisplayed();
+}
+
+ThemeInstalledInfoBarDelegate::~ThemeInstalledInfoBarDelegate() {
+ profile_->GetThemeProvider()->OnInfobarDestroyed();
}
void ThemeInstalledInfoBarDelegate::InfoBarClosed() {
- ExtensionsService* service = profile_->GetExtensionsService();
- // Only delete the theme if we've installed a new theme and not the same
- // theme on top of the current one.
- if (service && previous_theme_id_ != new_theme_id_) {
- std::string uninstall_id;
- if (was_canceled_)
- uninstall_id = new_theme_id_;
- else if (!previous_theme_id_.empty())
- uninstall_id = previous_theme_id_;
- // It's possible that the theme was already uninstalled by someone so make
- // sure it exists.
- if (!uninstall_id.empty() && service->GetExtensionById(uninstall_id, true))
- service->UninstallExtension(uninstall_id, false);
- }
delete this;
}
@@ -78,7 +68,6 @@ std::wstring ThemeInstalledInfoBarDelegate::GetButtonLabel(
}
bool ThemeInstalledInfoBarDelegate::Cancel() {
- was_canceled_ = true;
if (!previous_theme_id_.empty()) {
ExtensionsService* service = profile_->GetExtensionsService();
if (service) {
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index daa11e6..b8baf41 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -18,6 +18,7 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate {
ThemeInstalledInfoBarDelegate(TabContents* tab_contents,
const Extension* new_theme,
const std::string& previous_theme_id);
+ virtual ~ThemeInstalledInfoBarDelegate();
virtual void InfoBarClosed();
virtual std::wstring GetMessageText() const;
virtual SkBitmap* GetIcon() const;
@@ -30,15 +31,10 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate {
protected:
Profile* profile() { return profile_; }
- // Keeps track of whether we canceled the install or not.
- bool was_canceled_;
-
private:
Profile* profile_;
// Name of theme that's just been installed.
std::string name_;
- // Id of theme that's just been installed.
- std::string new_theme_id_;
// Used to undo theme install.
std::string previous_theme_id_;
};
diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
index 40127ca..12e9639 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
@@ -11,6 +11,7 @@
#include "app/gfx/canvas_paint.h"
#include "app/gfx/gtk_util.h"
#include "app/l10n_util.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 111029b..51990a0 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -379,7 +379,7 @@ class OffTheRecordProfileImpl : public Profile,
return GetOriginalProfile()->GetTheme();
}
- virtual ThemeProvider* GetThemeProvider() {
+ virtual BrowserThemeProvider* GetThemeProvider() {
return GetOriginalProfile()->GetThemeProvider();
}
@@ -1143,7 +1143,7 @@ Extension* ProfileImpl::GetTheme() {
return extensions_service_->GetExtensionById(id, false);
}
-ThemeProvider* ProfileImpl::GetThemeProvider() {
+BrowserThemeProvider* ProfileImpl::GetThemeProvider() {
InitThemes();
return theme_provider_.get();
}
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index 815dc22..1d15753 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -268,7 +268,7 @@ class Profile {
virtual Extension* GetTheme() = 0;
// Returns or creates the ThemeProvider associated with this profile
- virtual ThemeProvider* GetThemeProvider() = 0;
+ virtual BrowserThemeProvider* GetThemeProvider() = 0;
virtual ThumbnailStore* GetThumbnailStore() = 0;
@@ -430,7 +430,7 @@ class ProfileImpl : public Profile,
virtual void SetNativeTheme();
virtual void ClearTheme();
virtual Extension* GetTheme();
- virtual ThemeProvider* GetThemeProvider();
+ virtual BrowserThemeProvider* GetThemeProvider();
virtual ThumbnailStore* GetThumbnailStore();
virtual bool HasCreatedDownloadManager() const;
virtual URLRequestContextGetter* GetRequestContext();
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index 988f1f0..02eae58 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 53dc444..a496db9 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/views/frame/browser_frame_gtk.h"
#include "base/logging.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/status_bubble.h"
#include "chrome/browser/views/frame/browser_extender.h"
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index 32eabb8..1af9353 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -14,6 +14,7 @@
#include "app/win_util.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/views/frame/browser_non_client_frame_view.h"
#include "chrome/browser/views/frame/browser_root_view.h"
#include "chrome/browser/views/frame/browser_view.h"
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 0e6f16d..f59a18b 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -135,7 +135,7 @@ class TestingProfile : public Profile {
virtual void SetNativeTheme() {}
virtual void ClearTheme() {}
virtual Extension* GetTheme() { return NULL; }
- virtual ThemeProvider* GetThemeProvider() {
+ virtual BrowserThemeProvider* GetThemeProvider() {
InitThemes();
return theme_provider_.get();
}
generated by cgit v1.1 at 2025-02-08 18:20:44 +0000