Index: content/common/view_messages.h |
diff --git a/content/common/view_messages.h b/content/common/view_messages.h |
index c186f21647eee0f7de0e92473e89e313746427c5..0b2a13aecece3b3a5c3f481c482ef89050ea7001 100644 |
--- a/content/common/view_messages.h |
+++ b/content/common/view_messages.h |
@@ -8,8 +8,8 @@ |
#include "base/process.h" |
#include "base/shared_memory.h" |
#include "base/string16.h" |
-#include "cc/compositor_frame.h" |
-#include "cc/compositor_frame_ack.h" |
+#include "cc/output/compositor_frame.h" |
+#include "cc/output/compositor_frame_ack.h" |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
#include "content/common/edit_command.h" |
@@ -34,7 +34,6 @@ |
#include "media/audio/audio_parameters.h" |
#include "media/base/channel_layout.h" |
#include "media/base/media_log_event.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" |
@@ -45,6 +44,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" |
+#include "third_party/skia/include/core/SkBitmap.h" |
piman
2013/03/18 16:24:32
Ah... locale-dependent sorting...
|
#include "ui/base/ime/text_input_type.h" |
#include "ui/base/range/range.h" |
#include "ui/gfx/point.h" |