summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/common/extensions/extension_l10n_util.cc1
-rw-r--r--ui/base/l10n/l10n_util.cc8
-rw-r--r--ui/base/l10n/l10n_util.h6
3 files changed, 3 insertions, 12 deletions
diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc
index 8bc3868..63f4a1f 100644
--- a/chrome/common/extensions/extension_l10n_util.cc
+++ b/chrome/common/extensions/extension_l10n_util.cc
@@ -4,6 +4,7 @@
#include "chrome/common/extensions/extension_l10n_util.h"
+#include <algorithm>
#include <set>
#include <string>
#include <vector>
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index b244e8f..0c2e27e 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -18,7 +18,6 @@
#include "base/i18n/rtl.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "base/sys_string_conversions.h"
@@ -27,15 +26,12 @@
#include "ui/base/l10n/l10n_util_collator.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
-#include "ui/gfx/canvas.h"
#include "unicode/rbbi.h"
#include "unicode/uloc.h"
-#if defined(OS_MACOSX)
-#include "ui/base/l10n/l10n_util_mac.h"
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
#include "ui/base/l10n/l10n_util_win.h"
-#endif
+#endif // OS_WIN
namespace {
diff --git a/ui/base/l10n/l10n_util.h b/ui/base/l10n/l10n_util.h
index 90f5674..d0418c0 100644
--- a/ui/base/l10n/l10n_util.h
+++ b/ui/base/l10n/l10n_util.h
@@ -9,15 +9,9 @@
#define UI_BASE_L10N_L10N_UTIL_H_
#pragma once
-#include <algorithm>
-#include <functional>
#include <string>
#include <vector>
-#include "build/build_config.h"
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"