summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/gtk/tabs')
-rw-r--r--chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc8
-rw-r--r--chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h2
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc13
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h4
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc8
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.h2
6 files changed, 19 insertions, 18 deletions
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
index 8f017e7..4fa858c 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -164,10 +164,10 @@ DraggedTabControllerGtk::GetJavaScriptDialogCreator() {
////////////////////////////////////////////////////////////////////////////////
// DraggedTabControllerGtk, NotificationObserver implementation:
-void DraggedTabControllerGtk::Observe(NotificationType type,
+void DraggedTabControllerGtk::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
+ DCHECK(type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED);
DCHECK_EQ(Source<TabContents>(source).ptr(),
dragged_contents_->tab_contents());
EndDragImpl(TAB_DESTROYED);
@@ -187,7 +187,7 @@ void DraggedTabControllerGtk::SetDraggedContents(
TabContentsWrapper* new_contents) {
if (dragged_contents_) {
registrar_.Remove(this,
- NotificationType::TAB_CONTENTS_DESTROYED,
+ content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
Source<TabContents>(dragged_contents_->tab_contents()));
if (original_delegate_)
dragged_contents_->tab_contents()->set_delegate(original_delegate_);
@@ -196,7 +196,7 @@ void DraggedTabControllerGtk::SetDraggedContents(
dragged_contents_ = new_contents;
if (dragged_contents_) {
registrar_.Add(this,
- NotificationType::TAB_CONTENTS_DESTROYED,
+ content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
Source<TabContents>(dragged_contents_->tab_contents()));
// We need to be the delegate so we receive messages about stuff,
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
index 41c732d..d6fdb63 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
@@ -88,7 +88,7 @@ class DraggedTabControllerGtk : public NotificationObserver,
GetJavaScriptDialogCreator() OVERRIDE;
// Overridden from NotificationObserver:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index dda7ae0..64fe5ed 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/notification_service.h"
#include "grit/generated_resources.h"
@@ -156,7 +157,7 @@ TabRendererGtk::LoadingAnimation::LoadingAnimation(
animation_state_(ANIMATION_NONE),
animation_frame_(0) {
registrar_.Add(this,
- NotificationType::BROWSER_THEME_CHANGED,
+ chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
Source<ThemeService>(theme_service_));
}
@@ -200,10 +201,10 @@ bool TabRendererGtk::LoadingAnimation::ValidateLoadingAnimation(
}
void TabRendererGtk::LoadingAnimation::Observe(
- NotificationType type,
+ int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
+ DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
data_.reset(new Data(theme_service_));
}
@@ -273,7 +274,7 @@ TabRendererGtk::TabRendererGtk(ThemeService* theme_service)
hover_animation_.reset(new ui::SlideAnimation(this));
hover_animation_->SetSlideDuration(kHoverDurationMs);
- registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+ registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
Source<ThemeService>(theme_service_));
}
@@ -559,10 +560,10 @@ void TabRendererGtk::SetBounds(const gfx::Rect& bounds) {
gtk_widget_set_size_request(tab_.get(), bounds.width(), bounds.height());
}
-void TabRendererGtk::Observe(NotificationType type,
+void TabRendererGtk::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
+ DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
// Clear our cache when we receive a theme change notification because it
// contains cached bitmaps based off the previous theme.
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
index a8a36a3..c5e3728 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
@@ -81,7 +81,7 @@ class TabRendererGtk : public ui::AnimationDelegate,
}
// Provide NotificationObserver implementation.
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
@@ -164,7 +164,7 @@ class TabRendererGtk : public ui::AnimationDelegate,
virtual void SetBounds(const gfx::Rect& bounds);
// Provide NotificationObserver implementation.
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 9a7c251..f01809d 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -24,9 +24,9 @@
#include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h"
#include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
#include "grit/theme_resources.h"
#include "grit/theme_resources_standard.h"
#include "grit/ui_resources.h"
@@ -707,7 +707,7 @@ TabStripGtk::TabStripGtk(TabStripModel* model, BrowserWindowGtk* window)
added_as_message_loop_observer_(false),
hover_tab_selector_(model) {
theme_service_->InitThemesFor(this);
- registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+ registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
Source<ThemeService>(theme_service_));
}
@@ -1285,10 +1285,10 @@ void TabStripGtk::DidProcessEvent(GdkEvent* event) {
///////////////////////////////////////////////////////////////////////////////
// TabStripGtk, NotificationObserver implementation:
-void TabStripGtk::Observe(NotificationType type,
+void TabStripGtk::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type == NotificationType::BROWSER_THEME_CHANGED) {
+ if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
TabRendererGtk::SetSelectedTitleColor(theme_service_->GetColor(
ThemeService::COLOR_TAB_TEXT));
TabRendererGtk::SetUnselectedTitleColor(theme_service_->GetColor(
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
index cc47446..7615cf1 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
@@ -151,7 +151,7 @@ class TabStripGtk : public TabStripModelObserver,
virtual void DidProcessEvent(GdkEvent* event);
// Overridden from NotificationObserver:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
generated by cgit v1.1 at 2025-05-13 10:40:25 +0000