summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/background_badge.pngbin188 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd1
-rw-r--r--chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm9
-rw-r--r--chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm7
-rw-r--r--chrome/browser/ui/gtk/browser_toolbar_gtk.cc16
-rw-r--r--chrome/browser/ui/views/toolbar_view.cc28
6 files changed, 5 insertions, 56 deletions
diff --git a/chrome/app/theme/background_badge.png b/chrome/app/theme/background_badge.png
deleted file mode 100644
index fb656c1..0000000
--- a/chrome/app/theme/background_badge.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 7b174de..69361d7 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -27,7 +27,6 @@
<include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BINDATA" />
<include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BINDATA" />
<include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
- <include name="IDR_BACKGROUND_BADGE" file="background_badge.png" type="BINDATA" />
<include name="IDR_BACK" file="back.png" type="BINDATA" />
<include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
<include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index fa499f2..9e2947e 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -16,7 +16,6 @@
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/background_page_tracker.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -130,9 +129,6 @@ class NotificationBridge : public NotificationObserver {
: controller_(controller) {
registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
NotificationService::AllSources());
- registrar_.Add(this,
- NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED,
- NotificationService::AllSources());
}
// Overridden from NotificationObserver:
@@ -143,8 +139,6 @@ class NotificationBridge : public NotificationObserver {
case NotificationType::PREF_CHANGED:
[controller_ prefChanged:Details<std::string>(details).ptr()];
break;
- case NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED:
- // fall-through
case NotificationType::UPGRADE_RECOMMENDED:
[controller_ badgeWrenchMenuIfNeeded];
break;
@@ -547,9 +541,6 @@ class NotificationBridge : public NotificationObserver {
int badgeResource = 0;
if (UpgradeDetector::GetInstance()->notify_upgrade()) {
badgeResource = IDR_UPDATE_BADGE;
- } else if (BackgroundPageTracker::GetInstance()->
- GetUnacknowledgedBackgroundPageCount() > 0) {
- badgeResource = IDR_BACKGROUND_BADGE;
} else {
// No badge - clear the badge if one is already set.
if ([[wrenchButton_ cell] overlayImage])
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index d4167bf..6c946ab 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
@@ -6,7 +6,6 @@
#include "base/sys_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_page_tracker.h"
#include "chrome/browser/metrics/user_metrics.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
@@ -124,12 +123,6 @@ class ZoomLevelObserver : public NotificationObserver {
[zoomFullScreen_ setImage:icon];
}
-- (void)menuDidClose:(NSMenu*)menu {
- // When the menu is closed, acknowledge the background pages so the badges go
- // away.
- BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
-}
-
// Used to dispatch commands from the Wrench menu. The custom items within the
// menu cannot be hooked up directly to First Responder because the window in
// which the controls reside is not the BrowserWindowController, but a
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index 9e7b4c2d..91a206c 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -15,7 +15,6 @@
#include "base/path_service.h"
#include "base/singleton.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_page_tracker.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -102,9 +101,6 @@ BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
registrar_.Add(this,
NotificationType::UPGRADE_RECOMMENDED,
NotificationService::AllSources());
- registrar_.Add(this,
- NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED,
- NotificationService::AllSources());
}
BrowserToolbarGtk::~BrowserToolbarGtk() {
@@ -316,9 +312,6 @@ void BrowserToolbarGtk::StoppedShowing() {
gtk_chrome_button_set_hover_state(
GTK_CHROME_BUTTON(wrench_menu_button_->widget()), 0.0);
wrench_menu_button_->UnsetPaintOverride();
-
- // Stop showing the BG page badge when we close the wrench menu.
- BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
}
GtkIconSet* BrowserToolbarGtk::GetIconSetForId(int idr) {
@@ -328,8 +321,7 @@ GtkIconSet* BrowserToolbarGtk::GetIconSetForId(int idr) {
// Always show images because we desire that some icons always show
// regardless of the system setting.
bool BrowserToolbarGtk::AlwaysShowIconForCmd(int command_id) const {
- return command_id == IDC_UPGRADE_DIALOG ||
- command_id == IDC_VIEW_BACKGROUND_PAGES;
+ return command_id == IDC_UPGRADE_DIALOG;
}
// ui::AcceleratorProvider
@@ -384,8 +376,7 @@ void BrowserToolbarGtk::Observe(NotificationType type,
}
UpdateRoundedness();
- } else if (type == NotificationType::UPGRADE_RECOMMENDED ||
- type == NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED) {
+ } else if (type == NotificationType::UPGRADE_RECOMMENDED) {
// Redraw the wrench menu to update the badge.
gtk_widget_queue_draw(wrench_menu_button_->widget());
} else if (type == NotificationType::ZOOM_LEVEL_CHANGED) {
@@ -639,9 +630,6 @@ gboolean BrowserToolbarGtk::OnWrenchMenuButtonExpose(GtkWidget* sender,
const SkBitmap* badge = NULL;
if (UpgradeDetector::GetInstance()->notify_upgrade()) {
badge = theme_provider_->GetBitmapNamed(IDR_UPDATE_BADGE);
- } else if (BackgroundPageTracker::GetInstance()->
- GetUnacknowledgedBackgroundPageCount()) {
- badge = theme_provider_->GetBitmapNamed(IDR_BACKGROUND_BADGE);
} else {
return FALSE;
}
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 1821271..1eb475a 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -8,7 +8,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/accessibility/browser_accessibility_state.h"
-#include "chrome/browser/background_page_tracker.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -119,9 +118,6 @@ ToolbarView::ToolbarView(Browser* browser)
}
registrar_.Add(this, NotificationType::MODULE_INCOMPATIBILITY_DETECTED,
NotificationService::AllSources());
- registrar_.Add(this,
- NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED,
- NotificationService::AllSources());
}
ToolbarView::~ToolbarView() {
@@ -211,8 +207,7 @@ void ToolbarView::Init(Profile* profile) {
app_menu_->SetID(VIEW_ID_APP_MENU);
// Add any necessary badges to the menu item based on the system state.
- if (IsUpgradeRecommended() || ShouldShowIncompatibilityWarning() ||
- ShouldShowBackgroundPageBadge()) {
+ if (IsUpgradeRecommended() || ShouldShowIncompatibilityWarning()) {
UpdateAppMenuBadge();
}
LoadImages();
@@ -358,9 +353,6 @@ void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) {
if (destroyed_flag)
return;
destroyed_flag_ = NULL;
-
- // Stop showing the background app badge also.
- BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
}
////////////////////////////////////////////////////////////////////////////////
@@ -438,10 +430,6 @@ void ToolbarView::Observe(NotificationType type,
bool confirmed_bad = *Details<bool>(details).ptr();
if (confirmed_bad)
UpdateAppMenuBadge();
- } else if (type ==
- NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED) {
- // Force a repaint to add/remove the badge.
- UpdateAppMenuBadge();
}
}
@@ -670,11 +658,6 @@ bool ToolbarView::IsUpgradeRecommended() {
#endif
}
-bool ToolbarView::ShouldShowBackgroundPageBadge() {
- return BackgroundPageTracker::GetInstance()->
- GetUnacknowledgedBackgroundPageCount() > 0;
-}
-
bool ToolbarView::ShouldShowIncompatibilityWarning() {
#if defined(OS_WIN)
EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
@@ -770,9 +753,7 @@ SkBitmap ToolbarView::GetAppMenuIcon(views::CustomButton::ButtonState state) {
incompatibility_badge_showing = false;
#endif
- bool add_badge = IsUpgradeRecommended() ||
- ShouldShowIncompatibilityWarning() ||
- ShouldShowBackgroundPageBadge();
+ bool add_badge = IsUpgradeRecommended() || ShouldShowIncompatibilityWarning();
if (!add_badge)
return icon;
@@ -783,12 +764,9 @@ SkBitmap ToolbarView::GetAppMenuIcon(views::CustomButton::ButtonState state) {
SkBitmap badge;
// Only one badge can be active at any given time. The Upgrade notification
- // is deemed most important, then the temporary background page badge,
- // then the DLL conflict badge.
+ // is deemed most important, then the DLL conflict badge.
if (IsUpgradeRecommended()) {
badge = *tp->GetBitmapNamed(IDR_UPDATE_BADGE);
- } else if (ShouldShowBackgroundPageBadge()) {
- badge = *tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
} else if (ShouldShowIncompatibilityWarning()) {
#if defined(OS_WIN)
if (!was_showing)
generated by cgit v1.1 at 2025-02-21 02:38:24 +0000