chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc - Issue 10337010: Revert r123782.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

Issue 10337010: Revert r123782. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

index 1d84cb3016e27a36d4375e245fcef047bec39d48..a927645fc5c9205f1bafc68d2bb43c6f83895af9 100644

--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

@@ -24,11 +24,11 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/gtk/custom_button.h"

+#include "chrome/browser/ui/gtk/gtk_theme_service.h"

#include "chrome/browser/ui/gtk/gtk_util.h"

#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/browser/ui/gtk/theme_service_gtk.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/extension.h"

#include "content/public/browser/notification_source.h"

@@ -209,7 +209,7 @@ void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {

}

void BalloonViewImpl::Show(Balloon* balloon) {

- theme_service_ = ThemeServiceGtk::GetFrom(balloon->profile());

+ theme_service_ = GtkThemeService::GetFrom(balloon->profile());

const std::string source_label_text = l10n_util::GetStringFUTF8(

IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,