| Index: chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc (revision 91968)
|
| +++ chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc (working copy)
|
| @@ -27,13 +27,13 @@
|
| #include "chrome/browser/ui/gtk/menu_gtk.h"
|
| #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
|
| #include "chrome/browser/ui/gtk/rounded_window.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| #include "content/browser/renderer_host/render_widget_host_view.h"
|
| #include "content/common/notification_details.h"
|
| #include "content/common/notification_service.h"
|
| #include "content/common/notification_source.h"
|
| -#include "content/common/notification_type.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/theme_resources.h"
|
| #include "grit/theme_resources_standard.h"
|
| @@ -313,7 +313,7 @@
|
| options_menu_button_->widget());
|
| gtk_box_pack_end(GTK_BOX(hbox_), options_alignment, FALSE, FALSE, 0);
|
|
|
| - notification_registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
|
| + notification_registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
|
| Source<ThemeService>(theme_service_));
|
|
|
| // We don't do InitThemesFor() because it just forces a redraw.
|
| @@ -337,7 +337,7 @@
|
| gtk_widget_show_all(frame_container_);
|
|
|
| notification_registrar_.Add(this,
|
| - NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
|
| + chrome::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
|
| }
|
|
|
| void BalloonViewImpl::Update() {
|
| @@ -380,17 +380,17 @@
|
| content_size.width(), content_size.height());
|
| }
|
|
|
| -void BalloonViewImpl::Observe(NotificationType type,
|
| +void BalloonViewImpl::Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| - if (type == NotificationType::NOTIFY_BALLOON_DISCONNECTED) {
|
| + if (type == chrome::NOTIFY_BALLOON_DISCONNECTED) {
|
| // If the renderer process attached to this balloon is disconnected
|
| // (e.g., because of a crash), we want to close the balloon.
|
| notification_registrar_.Remove(this,
|
| - NotificationType::NOTIFY_BALLOON_DISCONNECTED,
|
| + chrome::NOTIFY_BALLOON_DISCONNECTED,
|
| Source<Balloon>(balloon_));
|
| Close(false);
|
| - } else if (type == NotificationType::BROWSER_THEME_CHANGED) {
|
| + } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
|
| // Since all the buttons change their own properties, and our expose does
|
| // all the real differences, we'll need a redraw.
|
| gtk_widget_queue_draw(frame_container_);
|
|
|