Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1036)

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 9447096: gtk: Rename GtkThemeService to ThemeServiceGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 8ef61ff9fa4c088395e17992845d2ddf5ebd8681..9f95955d4b27a8bb131a98af35a00656f896d165 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -40,11 +40,11 @@
#include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
#include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
#include "chrome/browser/ui/gtk/first_run_bubble.h"
-#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/browser/ui/gtk/nine_box.h"
#include "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
#include "chrome/browser/ui/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/theme_service_gtk.h"
#include "chrome/browser/ui/gtk/view_id_util.h"
#include "chrome/browser/ui/omnibox/location_bar_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -191,7 +191,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
popup_window_mode_ = popup_window_mode;
Profile* profile = browser_->profile();
- theme_service_ = GtkThemeService::GetFrom(profile);
+ theme_service_ = ThemeServiceGtk::GetFrom(profile);
// Create the widget first, so we can pass it to the OmniboxViewGtk.
hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding));
@@ -825,7 +825,7 @@ gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
GdkEventExpose* event) {
// If we're not using GTK theming, draw our own border over the edge pixels
// of the background.
- if (!GtkThemeService::GetFrom(browser_->profile())->UsingNativeTheme()) {
+ if (!ThemeServiceGtk::GetFrom(browser_->profile())->UsingNativeTheme()) {
int left, center, right;
if (popup_window_mode_) {
left = right = IDR_LOCATIONBG_POPUPMODE_EDGE;
@@ -1288,7 +1288,7 @@ void LocationBarViewGtk::ContentSettingImageViewGtk::UpdateFromWebContents(
}
gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()),
- GtkThemeService::GetFrom(parent_->browser()->profile())->GetImageNamed(
+ ThemeServiceGtk::GetFrom(parent_->browser()->profile())->GetImageNamed(
content_setting_image_model_->get_icon())->ToGdkPixbuf());
gtk_widget_set_tooltip_text(widget(),
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.h ('k') | chrome/browser/ui/gtk/notifications/balloon_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698