0

Use a direct include of strings headers in ui/, part 1.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16402012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205507 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
avi@chromium.org
2013-06-11 12:31:09 +00:00
parent a9877420d5
commit b576ef1164
60 changed files with 70 additions and 70 deletions

@ -5,7 +5,7 @@
#ifndef UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
#define UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
namespace gfx {

@ -5,7 +5,7 @@
#import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
#include "base/mac/foundation_util.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "ui/app_list/app_list_item_model.h"
#import "ui/app_list/cocoa/apps_grid_controller.h"
#import "ui/app_list/cocoa/apps_grid_view_item.h"

@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/message_loop.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/app_list/pagination_model_observer.h"

@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/selection_model.h"

@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/base/models/list_model.h"
#include "ui/base/range/range.h"

@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
namespace app_list {

@ -4,7 +4,7 @@
#include "ui/app_list/test/app_list_test_model.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "ui/app_list/app_list_item_model.h"
namespace app_list {

@ -6,7 +6,7 @@
#include <algorithm>
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_item_model.h"
#include "ui/app_list/app_list_model.h"

@ -4,7 +4,7 @@
#include "ui/app_list/views/app_list_view.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_view_delegate.h"

@ -5,7 +5,7 @@
#ifndef UI_AURA_CLIENT_CURSOR_CLIENT_H_
#define UI_AURA_CLIENT_CURSOR_CLIENT_H_
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/aura/aura_export.h"
#include "ui/gfx/native_widget_types.h"

@ -4,7 +4,7 @@
#include "base/memory/scoped_vector.h"
#include "base/run_loop.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/timer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"

@ -9,7 +9,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/aura/root_window_host.h"
#include "ui/base/events/event_constants.h"
#include "ui/gfx/native_widget_types.h"

@ -22,9 +22,9 @@
#include "base/message_loop.h"
#include "base/message_pump_aurax11.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPostConfig.h"

@ -4,7 +4,7 @@
#include "ui/aura/test/test_window_delegate.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "ui/aura/window.h"
#include "ui/base/events/event.h"
#include "ui/base/hit_test.h"

@ -4,7 +4,7 @@
#include "ui/aura/test/test_windows.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/compositor/layer.h"

@ -11,8 +11,8 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/event_client.h"
#include "ui/aura/client/screen_position_client.h"

@ -13,7 +13,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/aura/aura_export.h"
#include "ui/aura/client/window_types.h"
#include "ui/aura/window_observer.h"

@ -8,8 +8,8 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/focus_change_observer.h"

@ -12,7 +12,7 @@
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ui_strings.h"
#include "ui/base/l10n/l10n_util.h"

@ -12,7 +12,7 @@
#define UI_BASE_ACCELERATORS_ACCELERATOR_H_
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/accelerators/platform_accelerator.h"
#include "ui/base/events/event_constants.h"
#include "ui/base/keycodes/keyboard_codes.h"

@ -5,7 +5,7 @@
#include "ui/base/accessibility/accessible_text_utils.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
namespace ui {

@ -8,7 +8,7 @@
#include <vector>
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
namespace ui {

@ -6,7 +6,7 @@
#define UI_BASE_ACCESSIBILITY_ACCESSIBLE_VIEW_STATE_H_
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/ui_export.h"

@ -13,7 +13,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/shared_memory.h"
#include "base/process.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/threading/platform_thread.h"
#include "base/threading/thread_checker.h"
#include "ui/base/ui_export.h"

@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/pickle.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"

@ -11,8 +11,8 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/scoped_handle.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_hglobal.h"
#include "ui/base/clipboard/clipboard.h"

@ -12,7 +12,7 @@
#include <string>
#include <vector>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
namespace ui {

@ -17,8 +17,8 @@
#include "base/message_loop.h"
#include "base/safe_numerics.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_offset_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_gdi_object.h"

@ -13,7 +13,7 @@
#include <map>
#include <vector>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
class Pickle;

@ -13,7 +13,7 @@
#include <string>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/ui_export.h"

@ -5,7 +5,7 @@
#ifndef UI_BASE_COCOA_FIND_PASTEBOARD_H_
#define UI_BASE_COCOA_FIND_PASTEBOARD_H_
#include "base/string16.h"
#include "base/strings/string16.h"
#ifdef __OBJC__

@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include "base/memory/scoped_nsobject.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
namespace ui {

@ -6,7 +6,7 @@
#include "base/message_loop.h"
#include "base/strings/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ui_resources.h"
#include "grit/ui_strings.h"
#include "third_party/skia/include/core/SkBitmap.h"

@ -6,7 +6,7 @@
#define UI_BASE_CURSOR_CURSOR_LOADER_H_
#include "base/logging.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
#include "ui/gfx/display.h"
#include "ui/gfx/native_widget_types.h"

@ -6,7 +6,7 @@
#define UI_BASE_CURSOR_CURSOR_LOADER_WIN_H_
#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/cursor/cursor_loader.h"
namespace ui {

@ -9,7 +9,7 @@
#include <vector>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
class GURL;

@ -9,7 +9,7 @@
#include <vector>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
class GURL;

@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/message_pump_aurax11.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/net_util.h"
#include "ui/base/clipboard/clipboard.h"

@ -12,7 +12,7 @@
#include <cstring>
#include "base/metrics/histogram.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "ui/base/events/event_utils.h"
#include "ui/base/keycodes/keyboard_code_conversion.h"
#include "ui/gfx/point3_f.h"

@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/time.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"

@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/i18n/char_iterator.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/ime/composition_text.h"

@ -4,7 +4,7 @@
#include "ui/base/gtk/menu_label_accelerator_util.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
namespace {

@ -7,7 +7,7 @@
#include <vector>
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "ui/base/ui_export.h"
namespace ui {

@ -5,7 +5,7 @@
#ifndef UI_BASE_IME_COMPOSITION_TEXT_H_
#define UI_BASE_IME_COMPOSITION_TEXT_H_
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ime/composition_underline.h"
#include "ui/base/range/range.h"
#include "ui/base/ui_export.h"

@ -5,7 +5,7 @@
#include "ui/base/ime/fake_input_method.h"
#include "base/logging.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"
#include "ui/base/events/event_utils.h"

@ -20,7 +20,7 @@
#include "base/chromeos/chromeos_version.h"
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/third_party/icu/icu_utf.h"
#include "chromeos/dbus/dbus_thread_manager.h"

@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/debug/stack_trace.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/win/metro.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"

@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/i18n/rtl.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ime/composition_text.h"
#include "ui/base/ime/text_input_type.h"
#include "ui/base/range/range.h"

@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/win/scoped_comptr.h"
#include "ui/base/ime/composition_underline.h"
#include "ui/base/range/range.h"

@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
namespace ui {

@ -4,10 +4,10 @@
#include "ui/base/l10n/l10n_font_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/font.h"
namespace ui {

@ -18,10 +18,10 @@
#include "base/lazy_instance.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"

@ -11,8 +11,8 @@
#include <string>
#include <vector>
#include "base/string16.h"
#include "base/string_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "ui/base/ui_export.h"
#if defined(OS_MACOSX)

@ -9,7 +9,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "jni/LocalizationUtils_jni.h"
#include "third_party/icu/public/common/unicode/uloc.h"

@ -9,7 +9,7 @@
#include <string>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
namespace l10n_util {

@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
#ifdef __OBJC__

@ -6,7 +6,7 @@
#if defined(OS_CHROMEOS)
#include "base/basictypes.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#endif
namespace l10n_util {

@ -15,7 +15,7 @@
#include "base/i18n/rtl.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_path_override.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -10,7 +10,7 @@
#include "base/i18n/rtl.h"
#include "base/lazy_instance.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/win/i18n.h"
#include "base/win/windows_version.h"
#include "grit/app_locale_settings.h"

@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
namespace l10n_util {