summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/base/gtk/g_object_destructor_filo.cc2
-rw-r--r--ui/base/gtk/g_object_destructor_filo.h8
-rw-r--r--ui/base/gtk/gdk_x_compat.h3
-rw-r--r--ui/base/touch/touch_factory.cc1
-rw-r--r--ui/base/touch/touch_factory.h3
-rw-r--r--ui/base/x/active_window_watcher_x.cc7
-rw-r--r--ui/base/x/active_window_watcher_x.h5
-rw-r--r--ui/base/x/events_x.cc1
-rw-r--r--ui/base/x/root_window_property_watcher_x.cc3
-rw-r--r--ui/base/x/root_window_property_watcher_x.h5
-rw-r--r--ui/base/x/valuators.cc3
-rw-r--r--ui/base/x/valuators.h4
-rw-r--r--ui/base/x/work_area_watcher_x.cc1
-rw-r--r--ui/base/x/work_area_watcher_x.h3
-rw-r--r--ui/gfx/gtk_native_view_id_manager.cc5
-rw-r--r--ui/gfx/gtk_native_view_id_manager.h5
-rw-r--r--ui/views/focus/view_storage.cc3
-rw-r--r--ui/views/focus/view_storage.h12
-rw-r--r--ui/views/widget/x11_desktop_handler.cc3
-rw-r--r--ui/views/widget/x11_desktop_handler.h2
20 files changed, 53 insertions, 26 deletions
diff --git a/ui/base/gtk/g_object_destructor_filo.cc b/ui/base/gtk/g_object_destructor_filo.cc
index 9c05b98..fe253c7 100644
--- a/ui/base/gtk/g_object_destructor_filo.cc
+++ b/ui/base/gtk/g_object_destructor_filo.cc
@@ -5,7 +5,9 @@
#include "ui/base/gtk/g_object_destructor_filo.h"
#include <glib-object.h>
+
#include "base/logging.h"
+#include "base/memory/singleton.h"
namespace ui {
diff --git a/ui/base/gtk/g_object_destructor_filo.h b/ui/base/gtk/g_object_destructor_filo.h
index a01f7e3..76e41f7 100644
--- a/ui/base/gtk/g_object_destructor_filo.h
+++ b/ui/base/gtk/g_object_destructor_filo.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,12 +6,14 @@
#define UI_BASE_GTK_G_OBJECT_DESTRUCTOR_FILO_H_
#include <glib.h>
-#include <map>
#include <list>
+#include <map>
-#include "base/memory/singleton.h"
+#include "base/basictypes.h"
#include "ui/base/ui_export.h"
+template <typename T> struct DefaultSingletonTraits;
+
typedef struct _GObject GObject;
namespace ui {
diff --git a/ui/base/gtk/gdk_x_compat.h b/ui/base/gtk/gdk_x_compat.h
index b53aefc0..fd395c7 100644
--- a/ui/base/gtk/gdk_x_compat.h
+++ b/ui/base/gtk/gdk_x_compat.h
@@ -1,10 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef UI_BASE_GTK_GDK_X_COMPAT_H_
#define UI_BASE_GTK_GDK_X_COMPAT_H_
+#include <gtk/gtk.h>
#include <gdk/gdkx.h>
// Google Chrome must depend on GTK 2.18, at least until the next LTS drops
diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc
index 36e6a3b..18cbe1d 100644
--- a/ui/base/touch/touch_factory.cc
+++ b/ui/base/touch/touch_factory.cc
@@ -13,6 +13,7 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/memory/singleton.h"
#include "base/message_loop.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
diff --git a/ui/base/touch/touch_factory.h b/ui/base/touch/touch_factory.h
index 7cad9d1..1f19bede 100644
--- a/ui/base/touch/touch_factory.h
+++ b/ui/base/touch/touch_factory.h
@@ -9,11 +9,12 @@
#include <map>
#include <vector>
-#include "base/memory/singleton.h"
#include "base/hash_tables.h"
#include "base/timer.h"
#include "ui/base/ui_export.h"
+template <typename T> struct DefaultSingletonTraits;
+
typedef unsigned long Cursor;
typedef unsigned long Window;
typedef struct _XDisplay Display;
diff --git a/ui/base/x/active_window_watcher_x.cc b/ui/base/x/active_window_watcher_x.cc
index f766488..a277ccde 100644
--- a/ui/base/x/active_window_watcher_x.cc
+++ b/ui/base/x/active_window_watcher_x.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,9 +6,10 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#include "ui/base/gtk/gtk_compat.h"
-#include "ui/base/gtk/gdk_x_compat.h"
+#include "base/memory/singleton.h"
+#include "ui/base/gtk/gdk_x_compat.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/x/active_window_watcher_x_observer.h"
#include "ui/base/x/root_window_property_watcher_x.h"
#include "ui/base/x/x11_util.h"
diff --git a/ui/base/x/active_window_watcher_x.h b/ui/base/x/active_window_watcher_x.h
index b64edfe..9e0ae13 100644
--- a/ui/base/x/active_window_watcher_x.h
+++ b/ui/base/x/active_window_watcher_x.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,11 +6,12 @@
#define UI_BASE_X_ACTIVE_WINDOW_WATCHER_X_H_
#include "base/basictypes.h"
-#include "base/memory/singleton.h"
#include "base/observer_list.h"
#include "ui/base/ui_export.h"
#include "ui/base/x/x11_util.h"
+template <typename T> struct DefaultSingletonTraits;
+
namespace ui {
class ActiveWindowWatcherXObserver;
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index 3dc2586..4ad90e0 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/logging.h"
+#include "base/memory/singleton.h"
#include "base/message_pump_aurax11.h"
#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/touch/touch_factory.h"
diff --git a/ui/base/x/root_window_property_watcher_x.cc b/ui/base/x/root_window_property_watcher_x.cc
index de8b61e..dec47e2 100644
--- a/ui/base/x/root_window_property_watcher_x.cc
+++ b/ui/base/x/root_window_property_watcher_x.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,6 +7,7 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
+#include "base/memory/singleton.h"
#include "ui/base/x/active_window_watcher_x.h"
#include "ui/base/x/work_area_watcher_x.h"
diff --git a/ui/base/x/root_window_property_watcher_x.h b/ui/base/x/root_window_property_watcher_x.h
index f77c2bc..2d542d6 100644
--- a/ui/base/x/root_window_property_watcher_x.h
+++ b/ui/base/x/root_window_property_watcher_x.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,10 +8,11 @@
#include <gdk/gdk.h>
#include "base/basictypes.h"
-#include "base/memory/singleton.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/ui_export.h"
+template <typename T> struct DefaultSingletonTraits;
+
namespace ui {
namespace internal {
diff --git a/ui/base/x/valuators.cc b/ui/base/x/valuators.cc
index 6df343b..ed88edc 100644
--- a/ui/base/x/valuators.cc
+++ b/ui/base/x/valuators.cc
@@ -6,8 +6,9 @@
#include <X11/extensions/XInput2.h>
-#include "ui/base/x/x11_util.h"
+#include "base/memory/singleton.h"
#include "ui/base/touch/touch_factory.h"
+#include "ui/base/x/x11_util.h"
namespace {
diff --git a/ui/base/x/valuators.h b/ui/base/x/valuators.h
index 5cef206..f887025 100644
--- a/ui/base/x/valuators.h
+++ b/ui/base/x/valuators.h
@@ -5,9 +5,9 @@
#ifndef UI_BASE_X_VALUATORS_H_
#define UI_BASE_X_VALUATORS_H_
-#include <map>
+#include "base/basictypes.h"
-#include "base/memory/singleton.h"
+template <typename T> struct DefaultSingletonTraits;
typedef union _XEvent XEvent;
diff --git a/ui/base/x/work_area_watcher_x.cc b/ui/base/x/work_area_watcher_x.cc
index 0e2aaa2..053b489 100644
--- a/ui/base/x/work_area_watcher_x.cc
+++ b/ui/base/x/work_area_watcher_x.cc
@@ -4,6 +4,7 @@
#include "ui/base/x/work_area_watcher_x.h"
+#include "base/memory/singleton.h"
#include "ui/base/work_area_watcher_observer.h"
#include "ui/base/x/root_window_property_watcher_x.h"
#include "ui/base/x/x11_util.h"
diff --git a/ui/base/x/work_area_watcher_x.h b/ui/base/x/work_area_watcher_x.h
index 99a7849..f888ea0 100644
--- a/ui/base/x/work_area_watcher_x.h
+++ b/ui/base/x/work_area_watcher_x.h
@@ -6,11 +6,12 @@
#define UI_BASE_X_WORK_AREA_WATCHER_X_H_
#include "base/basictypes.h"
-#include "base/memory/singleton.h"
#include "base/observer_list.h"
#include "ui/base/ui_export.h"
#include "ui/base/x/x11_util.h"
+template <typename T> struct DefaultSingletonTraits;
+
namespace ui {
class WorkAreaWatcherObserver;
diff --git a/ui/gfx/gtk_native_view_id_manager.cc b/ui/gfx/gtk_native_view_id_manager.cc
index 43f324c..07e1ed4 100644
--- a/ui/gfx/gtk_native_view_id_manager.cc
+++ b/ui/gfx/gtk_native_view_id_manager.cc
@@ -4,13 +4,14 @@
#include "ui/gfx/gtk_native_view_id_manager.h"
-#include <gtk/gtk.h>
#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
#include "base/logging.h"
+#include "base/memory/singleton.h"
#include "base/rand_util.h"
-#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gdk_x_compat.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/gfx/gtk_preserve_window.h"
// -----------------------------------------------------------------------------
diff --git a/ui/gfx/gtk_native_view_id_manager.h b/ui/gfx/gtk_native_view_id_manager.h
index da02dc6..7c8afcc 100644
--- a/ui/gfx/gtk_native_view_id_manager.h
+++ b/ui/gfx/gtk_native_view_id_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,11 +7,12 @@
#include <map>
-#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"
#include "ui/base/ui_export.h"
#include "ui/gfx/native_widget_types.h"
+template <typename T> struct DefaultSingletonTraits;
+
typedef unsigned long XID;
struct _GtkPreserveWindow;
diff --git a/ui/views/focus/view_storage.cc b/ui/views/focus/view_storage.cc
index ae17c73..0c7f170 100644
--- a/ui/views/focus/view_storage.cc
+++ b/ui/views/focus/view_storage.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,6 +7,7 @@
#include <algorithm>
#include "base/logging.h"
+#include "base/memory/singleton.h"
#include "base/stl_util.h"
namespace views {
diff --git a/ui/views/focus/view_storage.h b/ui/views/focus/view_storage.h
index fbfceea..629aec1 100644
--- a/ui/views/focus/view_storage.h
+++ b/ui/views/focus/view_storage.h
@@ -1,12 +1,17 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef UI_VIEWS_FOCUS_VIEW_STORAGE_H_
#define UI_VIEWS_FOCUS_VIEW_STORAGE_H_
-#include "base/memory/singleton.h"
-#include "ui/views/view.h"
+#include <map>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "ui/views/views_export.h"
+
+template <typename T> struct DefaultSingletonTraits;
// This class is a simple storage place for storing/retrieving views. It is
// used for example in the FocusManager to store/restore focused views when the
@@ -18,6 +23,7 @@
// to store/retrieve views.
namespace views {
+class View;
class VIEWS_EXPORT ViewStorage {
public:
diff --git a/ui/views/widget/x11_desktop_handler.cc b/ui/views/widget/x11_desktop_handler.cc
index 06b580b..c39fb43 100644
--- a/ui/views/widget/x11_desktop_handler.cc
+++ b/ui/views/widget/x11_desktop_handler.cc
@@ -4,13 +4,14 @@
#include "ui/views/widget/x11_desktop_handler.h"
-#include "ui/views/widget/desktop_native_widget_helper_aura.h"
+#include "base/message_loop.h"
#include "ui/aura/desktop/desktop_activation_client.h"
#include "ui/aura/dispatcher_linux.h"
#include "ui/aura/env.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/root_window.h"
#include "ui/base/x/x11_util.h"
+#include "ui/views/widget/desktop_native_widget_helper_aura.h"
namespace {
diff --git a/ui/views/widget/x11_desktop_handler.h b/ui/views/widget/x11_desktop_handler.h
index 144288e..5c93c07 100644
--- a/ui/views/widget/x11_desktop_handler.h
+++ b/ui/views/widget/x11_desktop_handler.h
@@ -14,6 +14,8 @@
#include "ui/aura/x11_atom_cache.h"
#include "ui/views/views_export.h"
+template <typename T> struct DefaultSingletonTraits;
+
namespace aura {
class FocusManager;
class DesktopActivationClient;
generated by cgit v1.1 at 2025-02-12 10:41:12 +0000