chrome/browser/ui/gtk/custom_button.cc - Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/ui/gtk/custom_button.cc

Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

	8 #include "base/logging.h"

8 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"	9 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"

9 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"	10 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"

10 #include "chrome/browser/ui/gtk/gtk_theme_service.h"	11 #include "chrome/browser/ui/gtk/gtk_theme_service.h"

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

12 #include "chrome/common/chrome_notification_types.h"	13 #include "chrome/common/chrome_notification_types.h"

13 #include "content/common/notification_service.h"	14 #include "content/public/browser/notification_source.h"

14 #include "grit/theme_resources_standard.h"	15 #include "grit/theme_resources_standard.h"

15 #include "third_party/skia/include/core/SkBitmap.h"	16 #include "third_party/skia/include/core/SkBitmap.h"

16 #include "ui/base/resource/resource_bundle.h"	17 #include "ui/base/resource/resource_bundle.h"

17 #include "ui/gfx/gtk_util.h"	18 #include "ui/gfx/gtk_util.h"

18 #include "ui/gfx/skbitmap_operations.h"	19 #include "ui/gfx/skbitmap_operations.h"

19	20

20 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,	21 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,

21 int normal_id,	22 int normal_id,

22 int pressed_id,	23 int pressed_id,

23 int hover_id,	24 int hover_id,

(...skipping 332 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
356 }	357 }

357	358

358 gtk_chrome_button_set_use_gtk_rendering(	359 gtk_chrome_button_set_use_gtk_rendering(

359 GTK_CHROME_BUTTON(widget()), UseGtkTheme());	360 GTK_CHROME_BUTTON(widget()), UseGtkTheme());

360 }	361 }

361	362

362 bool CustomDrawButton::UseGtkTheme() {	363 bool CustomDrawButton::UseGtkTheme() {

363 return !forcing_chrome_theme_ && theme_service_ &&	364 return !forcing_chrome_theme_ && theme_service_ &&

364 theme_service_->UsingNativeTheme();	365 theme_service_->UsingNativeTheme();

365 }	366 }

OLD	NEW