diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 15:51:40 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 15:51:40 +0000 |
commit | 5e9a383294ae9c867cfd8f9ec0da44cb86c592e7 (patch) | |
tree | d9bd842772e46497005f8918f7301a1add5a5426 /ui/views/focus | |
parent | 256ed7296169ee4886b76f556ceb3fafae3464b8 (diff) | |
download | chromium_src-5e9a383294ae9c867cfd8f9ec0da44cb86c592e7.zip chromium_src-5e9a383294ae9c867cfd8f9ec0da44cb86c592e7.tar.gz chromium_src-5e9a383294ae9c867cfd8f9ec0da44cb86c592e7.tar.bz2 |
ui: Forward declare DefaultSingletonTraits in header files.
Prefer forward declarations in header files, and instead include the singleton.h
in the source file.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10795024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
-rw-r--r-- | ui/views/focus/view_storage.cc | 3 | ||||
-rw-r--r-- | ui/views/focus/view_storage.h | 12 |
2 files changed, 11 insertions, 4 deletions
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: |