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

Unified Diff: cc/scrollbar_animation_controller.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_browsertests Created 8 years, 1 month 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
« no previous file with comments | « cc/scoped_thread_proxy.cc ('k') | cc/scrollbar_animation_controller_linear_fade.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_animation_controller.cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 529884f049752957e2a61838917a18a17540bc75..4d75877d2efcb9f31cea5d2f3dac5911bf98a278 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -2,20 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "config.h"
-
#include "cc/scrollbar_animation_controller.h"
-#include "cc/scrollbar_layer_impl.h"
#include "base/time.h"
+#include "build/build_config.h"
+#include "cc/scrollbar_layer_impl.h"
-#if OS(ANDROID)
+#if defined(OS_ANDROID)
#include "cc/scrollbar_animation_controller_linear_fade.h"
#endif
namespace cc {
-#if OS(ANDROID)
+#if defined(OS_ANDROID)
scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer)
{
static const double fadeoutDelay = 0.3;
« no previous file with comments | « cc/scoped_thread_proxy.cc ('k') | cc/scrollbar_animation_controller_linear_fade.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698