Index: app/gfx/native_widget_types_gtk.cc |
=================================================================== |
--- app/gfx/native_widget_types_gtk.cc (revision 28672) |
+++ app/gfx/native_widget_types_gtk.cc (working copy) |
@@ -2,9 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/gfx/native_widget_types.h" |
+#include "app/gfx/native_widget_types.h" |
-#include "base/gfx/gtk_native_view_id_manager.h" |
+#include "app/gfx/gtk_native_view_id_manager.h" |
#include "base/logging.h" |
namespace gfx { |
Property changes on: app/gfx/native_widget_types_gtk.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/gfx/native_widget_types_gtk.cc:r69-2775 |
Added: svn:eol-style |
+ LF |