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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_gtk.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/renderer_host/render_widget_host_view_gtk.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
6 6
7 // If this gets included after the gtk headers, then a bunch of compiler 7 // If this gets included after the gtk headers, then a bunch of compiler
8 // errors happen because of a "#define Status int" in Xlib.h, which interacts 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts
9 // badly with URLRequestStatus::Status. 9 // badly with URLRequestStatus::Status.
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 host_->ForwardEditCommandsForNextKeyEvent(edit_commands); 1099 host_->ForwardEditCommandsForNextKeyEvent(edit_commands);
1100 NativeWebKeyboardEvent copy_event(event); 1100 NativeWebKeyboardEvent copy_event(event);
1101 copy_event.match_edit_command = true; 1101 copy_event.match_edit_command = true;
1102 host_->ForwardKeyboardEvent(copy_event); 1102 host_->ForwardKeyboardEvent(copy_event);
1103 return; 1103 return;
1104 } 1104 }
1105 1105
1106 host_->ForwardKeyboardEvent(event); 1106 host_->ForwardKeyboardEvent(event);
1107 } 1107 }
1108 1108
1109 void RenderWidgetHostViewGtk::AnimationEnded(const Animation* animation) { 1109 void RenderWidgetHostViewGtk::AnimationEnded(const ui::Animation* animation) {
1110 gtk_widget_queue_draw(view_.get()); 1110 gtk_widget_queue_draw(view_.get());
1111 } 1111 }
1112 1112
1113 void RenderWidgetHostViewGtk::AnimationProgressed(const Animation* animation) { 1113 void RenderWidgetHostViewGtk::AnimationProgressed(
1114 const ui::Animation* animation) {
1114 gtk_widget_queue_draw(view_.get()); 1115 gtk_widget_queue_draw(view_.get());
1115 } 1116 }
1116 1117
1117 void RenderWidgetHostViewGtk::AnimationCanceled(const Animation* animation) { 1118 void RenderWidgetHostViewGtk::AnimationCanceled(
1119 const ui::Animation* animation) {
1118 gtk_widget_queue_draw(view_.get()); 1120 gtk_widget_queue_draw(view_.get());
1119 } 1121 }
1120 1122
1121 // static 1123 // static
1122 RenderWidgetHostView* 1124 RenderWidgetHostView*
1123 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( 1125 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
1124 gfx::NativeView widget) { 1126 gfx::NativeView widget) {
1125 gpointer user_data = g_object_get_data(G_OBJECT(widget), 1127 gpointer user_data = g_object_get_data(G_OBJECT(widget),
1126 kRenderWidgetHostViewKey); 1128 kRenderWidgetHostViewKey);
1127 return reinterpret_cast<RenderWidgetHostView*>(user_data); 1129 return reinterpret_cast<RenderWidgetHostView*>(user_data);
1128 } 1130 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_gtk.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698