FBTF: Remove unneeded headers from base/ (part 7)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3176026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57737 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 33 insertions, 29 deletions

diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 756cc20..4c66b9f 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -6,7 +6,6 @@
 
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
-#include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 
 #if defined(OS_WIN)
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index f756171..59eed68 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 
 #include "views/controls/combobox/native_combobox_gtk.h"
 
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "app/combobox_model.h"
-#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "views/controls/combobox/combobox.h"
 
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index 76db003..c6f8185 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -9,7 +9,6 @@
 
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
-#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "views/controls/listbox/listbox.h"
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc
index cf12e2b..467572d 100644
--- a/views/controls/menu/menu_2.cc
+++ b/views/controls/menu/menu_2.cc
@@ -5,7 +5,6 @@
 #include "views/controls/menu/menu_2.h"
 
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
diff --git a/views/controls/native/native_view_host_gtk.h b/views/controls/native/native_view_host_gtk.h
index fe82160..11be9b5 100644
--- a/views/controls/native/native_view_host_gtk.h
+++ b/views/controls/native/native_view_host_gtk.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
-#define VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
+#ifndef VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
+#define VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <string>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "gfx/rect.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
@@ -90,4 +90,4 @@ class NativeViewHostGtk : public NativeViewHostWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
+#endif  // VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
diff --git a/views/controls/native/native_view_host_win.h b/views/controls/native/native_view_host_win.h
index 6546f1a..fb8d8be 100644
--- a/views/controls/native/native_view_host_win.h
+++ b/views/controls/native/native_view_host_win.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 VIEWS_CONTROLS_HWND_VIEW_H_
-#define VIEWS_CONTROLS_HWND_VIEW_H_
+#ifndef VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
+#define VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
 #pragma once
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
 namespace views {
@@ -44,4 +44,4 @@ class NativeViewHostWin : public NativeViewHostWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_HWND_VIEW_H_
+#endif  // VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 0b1c070..564243e 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -6,7 +6,9 @@
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #pragma once
 
-#if defined (OS_LINUX)
+#include "build/build_config.h"
+
+#if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ -14,7 +16,9 @@
 
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
+#if !defined(OS_LINUX)
 #include "base/logging.h"
+#endif
 #include "base/string16.h"
 #include "gfx/font.h"
 #include "views/view.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 8657695..eba1a31 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -10,6 +10,7 @@
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
+#include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "gfx/canvas_skia.h"
@@ -603,6 +604,18 @@ void TreeView::RecursivelyDelete(NodeDetails* node) {
   delete node;
 }
 
+TreeView::NodeDetails* TreeView::GetNodeDetails(TreeModelNode* node) {
+  DCHECK(node &&
+         node_to_details_map_.find(node) != node_to_details_map_.end());
+  return node_to_details_map_[node];
+}
+
+// Returns the NodeDetails by identifier (lparam of the HTREEITEM).
+TreeView::NodeDetails* TreeView::GetNodeDetailsByID(int id) {
+  DCHECK(id_to_details_map_.find(id) != id_to_details_map_.end());
+  return id_to_details_map_[id];
+}
+
 TreeView::NodeDetails* TreeView::GetNodeDetailsByTreeItem(HTREEITEM tree_item) {
   DCHECK(tree_view_ && tree_item);
   TV_ITEM tv_item = {0};
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index c97149b..cbcfbe7 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -14,7 +14,6 @@
 #include "app/tree_model.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
-#include "base/logging.h"
 #include "views/controls/native_control.h"
 
 namespace views {
@@ -243,17 +242,10 @@ class TreeView : public NativeControl, TreeModelObserver {
   void RecursivelyDelete(NodeDetails* node);
 
   // Returns the NodeDetails by node from the model.
-  NodeDetails* GetNodeDetails(TreeModelNode* node) {
-    DCHECK(node &&
-           node_to_details_map_.find(node) != node_to_details_map_.end());
-    return node_to_details_map_[node];
-  }
+  NodeDetails* GetNodeDetails(TreeModelNode* node);
 
   // Returns the NodeDetails by identifier (lparam of the HTREEITEM).
-  NodeDetails* GetNodeDetailsByID(int id) {
-    DCHECK(id_to_details_map_.find(id) != id_to_details_map_.end());
-    return id_to_details_map_[id];
-  }
+  NodeDetails* GetNodeDetailsByID(int id);
 
   // Returns the NodeDetails by HTREEITEM.
   NodeDetails* GetNodeDetailsByTreeItem(HTREEITEM tree_item);
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index ab885d0..126513f 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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,7 +8,6 @@
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
 #include "base/base_drag_source.h"
-#include "base/logging.h"
 #include "gfx/canvas_skia.h"
 
 namespace views {