summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/clipboard/scoped_clipboard_writer.h1
-rw-r--r--app/gtk_util.h1
-rw-r--r--app/os_exchange_data.h3
-rw-r--r--app/os_exchange_data_provider_gtk.h1
-rw-r--r--app/test_suite.h4
-rw-r--r--app/theme_provider.h4
-rw-r--r--base/debug_util.h3
-rw-r--r--base/event_recorder.h2
-rw-r--r--base/i18n/file_util_icu.h4
-rw-r--r--base/i18n/number_formatting.h4
-rw-r--r--base/i18n/word_iterator.h3
-rw-r--r--base/observer_list_threadsafe.h1
-rw-r--r--base/resource_util.h6
-rw-r--r--base/test/test_file_util.h4
14 files changed, 12 insertions, 29 deletions
diff --git a/app/clipboard/scoped_clipboard_writer.h b/app/clipboard/scoped_clipboard_writer.h
index 5622114..6869516 100644
--- a/app/clipboard/scoped_clipboard_writer.h
+++ b/app/clipboard/scoped_clipboard_writer.h
@@ -13,7 +13,6 @@
#pragma once
#include <string>
-#include <vector>
#include "app/clipboard/clipboard.h"
#include "base/file_path.h"
diff --git a/app/gtk_util.h b/app/gtk_util.h
index 63b0e47..6225d3e 100644
--- a/app/gtk_util.h
+++ b/app/gtk_util.h
@@ -7,7 +7,6 @@
#pragma once
#include <stdint.h>
-#include <string>
typedef struct _GtkWidget GtkWidget;
diff --git a/app/os_exchange_data.h b/app/os_exchange_data.h
index 7d68654..7a76198 100644
--- a/app/os_exchange_data.h
+++ b/app/os_exchange_data.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -10,7 +10,6 @@
#include <set>
#include <string>
-#include <vector>
#if defined(OS_WIN)
#include <objidl.h>
diff --git a/app/os_exchange_data_provider_gtk.h b/app/os_exchange_data_provider_gtk.h
index c6a8c47..276bf90 100644
--- a/app/os_exchange_data_provider_gtk.h
+++ b/app/os_exchange_data_provider_gtk.h
@@ -10,7 +10,6 @@
#include <map>
#include <set>
#include <string>
-#include <vector>
#include "app/os_exchange_data.h"
#include "base/pickle.h"
diff --git a/app/test_suite.h b/app/test_suite.h
index 15276df..eea955e 100644
--- a/app/test_suite.h
+++ b/app/test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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,8 +8,6 @@
#include "build/build_config.h"
-#include <string>
-
#include "app/app_paths.h"
#include "app/resource_bundle.h"
#include "base/path_service.h"
diff --git a/app/theme_provider.h b/app/theme_provider.h
index a7994a5..3d92e4d 100644
--- a/app/theme_provider.h
+++ b/app/theme_provider.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -6,8 +6,6 @@
#define APP_THEME_PROVIDER_H_
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/base/debug_util.h b/base/debug_util.h
index 95df524..a7dba3a 100644
--- a/base/debug_util.h
+++ b/base/debug_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 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.
@@ -11,7 +11,6 @@
#pragma once
#include <iosfwd>
-#include <vector>
#include "base/basictypes.h"
diff --git a/base/event_recorder.h b/base/event_recorder.h
index 3fb2d23..04fbaa1 100644
--- a/base/event_recorder.h
+++ b/base/event_recorder.h
@@ -6,9 +6,9 @@
#define BASE_EVENT_RECORDER_H_
#pragma once
-#include <string>
#if defined(OS_WIN)
#include <windows.h>
+#include <stdio.h>
#endif
#include "base/basictypes.h"
diff --git a/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h
index eaf784b..bb51a88 100644
--- a/base/i18n/file_util_icu.h
+++ b/base/i18n/file_util_icu.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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,8 +8,6 @@
// File utilities that use the ICU library go in this file.
-#include <string>
-
#include "base/file_path.h"
#include "base/string16.h"
diff --git a/base/i18n/number_formatting.h b/base/i18n/number_formatting.h
index 5927f53..f5ec083 100644
--- a/base/i18n/number_formatting.h
+++ b/base/i18n/number_formatting.h
@@ -1,4 +1,4 @@
-// Copyright (c) 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.
@@ -6,8 +6,6 @@
#define BASE_I18N_NUMBER_FORMATTING_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/string16.h"
diff --git a/base/i18n/word_iterator.h b/base/i18n/word_iterator.h
index fb0ee33..b9067c6 100644
--- a/base/i18n/word_iterator.h
+++ b/base/i18n/word_iterator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -6,7 +6,6 @@
#define BASE_I18N_WORD_ITERATOR_H_
#pragma once
-#include <string>
#include <vector>
#include "unicode/ubrk.h"
diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
index ab9633e..f781c03 100644
--- a/base/observer_list_threadsafe.h
+++ b/base/observer_list_threadsafe.h
@@ -8,7 +8,6 @@
#include <algorithm>
#include <map>
-#include <vector>
#include "base/basictypes.h"
#include "base/callback.h"
diff --git a/base/resource_util.h b/base/resource_util.h
index 2f6b8e0..8a37f95 100644
--- a/base/resource_util.h
+++ b/base/resource_util.h
@@ -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.
@@ -10,16 +10,16 @@
#pragma once
#include <windows.h>
-#include <string>
#include "base/basictypes.h"
namespace base {
+
// Function for getting a data resource (BINDATA) from a dll. Some
// resources are optional, especially in unit tests, so this returns false
// but doesn't raise an error if the resource can't be loaded.
bool GetDataResourceFromModule(HMODULE module, int resource_id,
void** data, size_t* length);
-} // namespace
+} // namespace base
#endif // BASE_RESOURCE_UTIL_H__
diff --git a/base/test/test_file_util.h b/base/test/test_file_util.h
index 8161d13..362c525 100644
--- a/base/test/test_file_util.h
+++ b/base/test/test_file_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 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,8 +8,6 @@
// File utility functions used only by tests.
-#include <string>
-
class FilePath;
namespace file_util {