| Index: app/gfx/gtk_native_view_id_manager.h
|
| ===================================================================
|
| --- app/gfx/gtk_native_view_id_manager.h (revision 28672)
|
| +++ app/gfx/gtk_native_view_id_manager.h (working copy)
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
| -#define BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
| +#ifndef APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
| +#define APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
|
|
| #include <map>
|
|
|
| +#include "app/gfx/native_widget_types.h"
|
| #include "base/singleton.h"
|
| -#include "base/gfx/native_widget_types.h"
|
|
|
| typedef unsigned long XID;
|
|
|
| @@ -88,4 +88,4 @@
|
| DISALLOW_COPY_AND_ASSIGN(GtkNativeViewManager);
|
| };
|
|
|
| -#endif // BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
| +#endif // APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
|
|
|
| Property changes on: app/gfx/gtk_native_view_id_manager.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/base/gfx/gtk_native_view_id_manager.h:r69-2775
|
| Added: svn:eol-style
|
| + LF
|
|
|
|
|