diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:46:07 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:46:07 +0000 |
| commit | 301e5f36c2539ddebd68d98eec9a2c91480d477f (patch) | |
| tree | e2f00243ab9367d74fad3f3427a726a771f08b26 /chrome/browser/ui/views | |
| parent | cb0612ea5b10d6003de853d0339869df5adcc985 (diff) | |
| download | chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.zip chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.tar.gz chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.tar.bz2 | |
Revert 66571 - When an extension is uninstalled, close all desktop notifications from that extension.
This change also refactors the balloon collection code to remove duplication between chrome and chromeos.
Removes some gross removal code which was using fake notifications just to get the right ID.
BUG=58266
TEST=open notifications from extension, uninstall extensions
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65879
Review URL: http://codereview.chromium.org/4635007
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/5162003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views')
| -rw-r--r-- | chrome/browser/ui/views/extensions/extension_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/location_bar/location_bar_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/notifications/balloon_view.cc | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index 99cf2eb..fcace1a 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/extensions/extension_view.h" +#include "chrome/browser/views/extensions/extension_view.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index c3fd530..d7a8920 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/views/location_bar/location_bar_view.h" #if defined(OS_LINUX) #include <gtk/gtk.h> diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index d2696d4..c394b9a 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -14,7 +14,6 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/desktop_notification_service.h" -#include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_options_menu_model.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" |