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

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

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void CustomDrawHoverController::Init(GtkWidget* widget) { 201 void CustomDrawHoverController::Init(GtkWidget* widget) {
202 DCHECK(widget_ == NULL); 202 DCHECK(widget_ == NULL);
203 widget_ = widget; 203 widget_ = widget;
204 g_signal_connect(widget_, "enter-notify-event", 204 g_signal_connect(widget_, "enter-notify-event",
205 G_CALLBACK(OnEnterThunk), this); 205 G_CALLBACK(OnEnterThunk), this);
206 g_signal_connect(widget_, "leave-notify-event", 206 g_signal_connect(widget_, "leave-notify-event",
207 G_CALLBACK(OnLeaveThunk), this); 207 G_CALLBACK(OnLeaveThunk), this);
208 } 208 }
209 209
210 void CustomDrawHoverController::AnimationProgressed( 210 void CustomDrawHoverController::AnimationProgressed(
211 const ui::Animation* animation) { 211 const gfx::Animation* animation) {
212 gtk_widget_queue_draw(widget_); 212 gtk_widget_queue_draw(widget_);
213 } 213 }
214 214
215 gboolean CustomDrawHoverController::OnEnter( 215 gboolean CustomDrawHoverController::OnEnter(
216 GtkWidget* widget, 216 GtkWidget* widget,
217 GdkEventCrossing* event) { 217 GdkEventCrossing* event) {
218 slide_animation_.Show(); 218 slide_animation_.Show();
219 return FALSE; 219 return FALSE;
220 } 220 }
221 221
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 } 388 }
389 389
390 gtk_chrome_button_set_use_gtk_rendering( 390 gtk_chrome_button_set_use_gtk_rendering(
391 GTK_CHROME_BUTTON(widget()), UseGtkTheme()); 391 GTK_CHROME_BUTTON(widget()), UseGtkTheme());
392 } 392 }
393 393
394 bool CustomDrawButton::UseGtkTheme() { 394 bool CustomDrawButton::UseGtkTheme() {
395 return !forcing_chrome_theme_ && theme_service_ && 395 return !forcing_chrome_theme_ && theme_service_ &&
396 theme_service_->UsingNativeTheme(); 396 theme_service_->UsingNativeTheme();
397 } 397 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/custom_button.h ('k') | chrome/browser/ui/gtk/download/download_item_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698