diff options
| author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 14:21:07 +0000 |
|---|---|---|
| committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 14:21:07 +0000 |
| commit | 440e4928ac89d844f79bb4377ced0a2d964c5d0a (patch) | |
| tree | e28c53dd191ea1e45c22ce7d34aba0a17e8af549 /chrome/browser/chromeos | |
| parent | 5832419f9625a1e286b5c796f1217fa4c3247087 (diff) | |
| download | chromium_src-440e4928ac89d844f79bb4377ced0a2d964c5d0a.zip chromium_src-440e4928ac89d844f79bb4377ced0a2d964c5d0a.tar.gz chromium_src-440e4928ac89d844f79bb4377ced0a2d964c5d0a.tar.bz2 | |
Google codestyle prescribes sorting #include filenames within a section.
Do it fast with following shell script:
export LC_ALL=C
find chrome/browser/chromeos/ -name '*.h' -o -name '*.cc' \
| xargs grep -C1 '^#include' \
| awk -F: '$2 !~ "include" { prev=""; next } ($2 <= prev) { print $1 } { prev=$2 }' \
| uniq \
| xargs -n1 sh -c 'cat "$1" \
| awk "{ tag=((/^#include/) \"_\" (/</) \"_\" (/third.party/)); print tag \"\t\" \$0 }" \
| awk -vi=0 -F\\t "{ if (!/^1_0_/ || \$1 != prev) { ++i } } { printf \"%09d\t%s\n\",i,\$0; prev=\$1 }" \
| sort \
| sed "s/^[0-9]*\t[0-9]_[0-9]_[0-9]\t//" > "$1".fixed; mv -f "$1".fixed "$1"' xxx
BUG=None
TEST=Manual
Review URL: http://codereview.chromium.org/3402010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
54 files changed, 80 insertions, 80 deletions
diff --git a/chrome/browser/chromeos/cros/burn_library.cc b/chrome/browser/chromeos/cros/burn_library.cc index ba80df9..d174348 100644 --- a/chrome/browser/chromeos/cros/burn_library.cc +++ b/chrome/browser/chromeos/cros/burn_library.cc @@ -6,8 +6,8 @@ #include <cstring> #include "base/linked_ptr.h" -#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/chromeos/cros/cros_library.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/burn_library.h b/chrome/browser/chromeos/cros/burn_library.h index f27d3e4..28ebdb1 100644 --- a/chrome/browser/chromeos/cros/burn_library.h +++ b/chrome/browser/chromeos/cros/burn_library.h @@ -10,8 +10,8 @@ #include <vector> #include "base/file_path.h" -#include "base/weak_ptr.h" #include "base/observer_list.h" +#include "base/weak_ptr.h" #include "cros/chromeos_imageburn.h" diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc index 8b783f6..a408c07 100644 --- a/chrome/browser/chromeos/cros/cros_library.cc +++ b/chrome/browser/chromeos/cros/cros_library.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/cros/cros_library.h" +#include "chrome/browser/chromeos/cros/burn_library.h" #include "chrome/browser/chromeos/cros/cros_library_loader.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" -#include "chrome/browser/chromeos/cros/burn_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/cros/keyboard_library.h" #include "chrome/browser/chromeos/cros/login_library.h" diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc index 3f8400b..58e4720 100644 --- a/chrome/browser/chromeos/cros/cros_mock.cc +++ b/chrome/browser/chromeos/cros/cros_mock.cc @@ -10,8 +10,8 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" -#include "chrome/browser/chromeos/cros/mock_keyboard_library.h" #include "chrome/browser/chromeos/cros/mock_input_method_library.h" +#include "chrome/browser/chromeos/cros/mock_keyboard_library.h" #include "chrome/browser/chromeos/cros/mock_library_loader.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/chromeos/cros/mock_power_library.h" @@ -23,8 +23,8 @@ #include "chrome/browser/chromeos/login/wizard_screen.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/mock_mount_library.h b/chrome/browser/chromeos/cros/mock_mount_library.h index 0aad288..32a52c2 100644 --- a/chrome/browser/chromeos/cros/mock_mount_library.h +++ b/chrome/browser/chromeos/cros/mock_mount_library.h @@ -10,10 +10,10 @@ #include "base/observer_list.h" #include "base/time.h" -#include "cros/chromeos_mount.h" #include "chrome/browser/chromeos/cros/mount_library.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "cros/chromeos_mount.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros_settings_provider_user.h b/chrome/browser/chromeos/cros_settings_provider_user.h index 42f2213..7cb088c 100644 --- a/chrome/browser/chromeos/cros_settings_provider_user.h +++ b/chrome/browser/chromeos/cros_settings_provider_user.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_USER_H_ #pragma once -#include "base/singleton.h" #include "base/scoped_ptr.h" +#include "base/singleton.h" #include "chrome/browser/chromeos/cros_settings_provider.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index 8d1633d..9c5acba 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/dom_ui/imageburner_ui.h" -#include "base/i18n/rtl.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/singleton.h" diff --git a/chrome/browser/chromeos/dom_ui/system_settings_provider.cc b/chrome/browser/chromeos/dom_ui/system_settings_provider.cc index f65158a..cd17c0d 100644 --- a/chrome/browser/chromeos/dom_ui/system_settings_provider.cc +++ b/chrome/browser/chromeos/dom_ui/system_settings_provider.cc @@ -6,10 +6,10 @@ #include <string> -#include "base/time.h" +#include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/stl_util-inl.h" +#include "base/time.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index e11b9a2..8ffbe2e 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -12,10 +12,10 @@ #include "base/command_line.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/chromeos/frame/panel_browser_view.h" -#include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/chromeos/status/language_menu_button.h" #include "chrome/browser/chromeos/status/network_menu_button.h" #include "chrome/browser/chromeos/status/status_area_button.h" +#include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/chromeos/view_ids.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/views/app_launcher.h" @@ -27,9 +27,9 @@ #include "chrome/browser/views/theme_background.h" #include "chrome/browser/views/toolbar_view.h" #include "chrome/common/chrome_switches.h" +#include "cros/chromeos_wm_ipc_enums.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" -#include "cros/chromeos_wm_ipc_enums.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 5bb5009..2f3f7eb 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -8,20 +8,20 @@ #include "app/resource_bundle.h" #include "base/logging.h" -#include "base/singleton.h" #include "base/scoped_ptr.h" +#include "base/singleton.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/common/notification_service.h" #include "cros/chromeos_wm_ipc_enums.h" -#include "grit/app_resources.h" #include "gfx/canvas_skia.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" +#include "third_party/skia/include/effects/SkGradientShader.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/frame/panel_controller.h b/chrome/browser/chromeos/frame/panel_controller.h index 8a28925..5d4920f 100644 --- a/chrome/browser/chromeos/frame/panel_controller.h +++ b/chrome/browser/chromeos/frame/panel_controller.h @@ -9,8 +9,8 @@ #include <gtk/gtk.h> #include "app/x11_util.h" -#include "views/controls/button/button.h" #include "cros/chromeos_wm_ipc_enums.h" +#include "views/controls/button/button.h" class BrowserView; class SkBitmap; diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc index dee48fc..1d2b9cc 100644 --- a/chrome/browser/chromeos/gview_request_interceptor.cc +++ b/chrome/browser/chromeos/gview_request_interceptor.cc @@ -8,12 +8,12 @@ #include "base/path_service.h" #include "base/singleton.h" #include "chrome/common/chrome_paths.h" +#include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/load_flags.h" -#include "net/url_request/url_request_job.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_job.h" #include "net/url_request/url_request_redirect_job.h" -#include "googleurl/src/gurl.h" #include "webkit/glue/plugins/plugin_list.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index fa5e905..3444f53 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -26,11 +26,11 @@ #include "chrome/browser/chromeos/cros/cros_library_loader.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "cros/chromeos_cros_api.h" +#include "cros/chromeos_input_method_ui.h" #include "gfx/canvas.h" #include "gfx/font.h" #include "grit/app_locale_settings.h" -#include "cros/chromeos_cros_api.h" -#include "cros/chromeos_input_method_ui.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" #include "views/event.h" diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc index 2f4c940..9997625 100644 --- a/chrome/browser/chromeos/login/account_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc @@ -5,16 +5,16 @@ #include <string> #include "chrome/browser/child_process_security_policy.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/chromeos/login/account_screen.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" -#include "chrome/browser/chrome_thread.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "net/test/test_server.h" #include "net/url_request/url_request_about_job.h" #include "net/url_request/url_request_filter.h" -#include "net/test/test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h index a0333dc..57ee097 100644 --- a/chrome/browser/chromeos/login/background_view.h +++ b/chrome/browser/chromeos/login/background_view.h @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/version_loader.h" #include "chrome/browser/chromeos/status/status_area_host.h" +#include "chrome/browser/chromeos/version_loader.h" #include "views/controls/button/button.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc index 64ff144..b5e3a4f 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc +++ b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc @@ -14,8 +14,8 @@ #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { using ::testing::Return; diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index c5eaa2a..a41dea6 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -18,8 +18,8 @@ #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/chromeos/login/message_bubble.h" #include "chrome/browser/chromeos/login/password_changed_view.h" -#include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/user_controller.h" +#include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/wm_message_listener.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/google_service_auth_error.h" diff --git a/chrome/browser/chromeos/login/language_switch_menu.h b/chrome/browser/chromeos/login/language_switch_menu.h index d076ac9..a2819d9 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.h +++ b/chrome/browser/chromeos/login/language_switch_menu.h @@ -11,10 +11,10 @@ #include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "chrome/browser/language_combobox_model.h" +#include "testing/gtest/include/gtest/gtest_prod.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/view.h" -#include "testing/gtest/include/gtest/gtest_prod.h" class WizardControllerTest_SwitchLanguage_Test; diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 613d049..85a99ba 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc @@ -6,7 +6,6 @@ #include "base/time.h" #include "chrome/browser/browser.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" -#include "chrome/browser/profile_manager.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" #include "chrome/browser/chromeos/cros/mock_input_method_library.h" #include "chrome/browser/chromeos/cros/mock_keyboard_library.h" @@ -16,11 +15,12 @@ #include "chrome/browser/chromeos/cros/mock_screen_lock_library.h" #include "chrome/browser/chromeos/cros/mock_system_library.h" #include "chrome/browser/chromeos/cros/mock_touchpad_library.h" +#include "chrome/browser/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { using ::testing::_; diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 69ca588..93786b7 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -30,9 +30,9 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" -#include "chrome/common/logging_chrome.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/logging_chrome.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc index 19f13a6..43d5e0a 100644 --- a/chrome/browser/chromeos/login/network_screen.cc +++ b/chrome/browser/chromeos/login/network_screen.cc @@ -6,9 +6,9 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/logging.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "base/logging.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/network_selection_view.h" diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h index 3f22c21..0645597 100644 --- a/chrome/browser/chromeos/login/network_screen.h +++ b/chrome/browser/chromeos/login/network_screen.h @@ -6,14 +6,14 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_ #pragma once -#include "base/task.h" -#include "base/timer.h" #include "base/scoped_ptr.h" #include "base/string16.h" +#include "base/task.h" +#include "base/timer.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/chromeos/login/network_screen_delegate.h" #include "chrome/browser/chromeos/login/language_switch_menu.h" #include "chrome/browser/chromeos/login/message_bubble.h" +#include "chrome/browser/chromeos/login/network_screen_delegate.h" #include "chrome/browser/chromeos/login/view_screen.h" #include "chrome/browser/chromeos/network_list.h" #include "chrome/browser/chromeos/options/network_config_view.h" diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc index 2259024..b90ce75 100644 --- a/chrome/browser/chromeos/login/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc @@ -15,17 +15,17 @@ #include "chrome/browser/chromeos/cros/mock_login_library.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/chromeos/login/network_selection_view.h" -#include "chrome/browser/chromeos/login/network_screen.h" #include "chrome/browser/chromeos/login/mock_screen_observer.h" +#include "chrome/browser/chromeos/login/network_screen.h" +#include "chrome/browser/chromeos/login/network_selection_view.h" #include "chrome/browser/chromeos/login/view_screen.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" #include "chrome/browser/chromeos/login/wizard_screen.h" #include "chrome/test/ui_test_utils.h" #include "grit/generated_resources.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "views/controls/button/text_button.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc index f0595d7..f26d305 100644 --- a/chrome/browser/chromeos/login/new_user_view.cc +++ b/chrome/browser/chromeos/login/new_user_view.cc @@ -18,8 +18,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/utf_string_conversions.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" diff --git a/chrome/browser/chromeos/login/owner_key_utils.cc b/chrome/browser/chromeos/login/owner_key_utils.cc index f9eb1fe..3016561 100644 --- a/chrome/browser/chromeos/login/owner_key_utils.cc +++ b/chrome/browser/chromeos/login/owner_key_utils.cc @@ -18,8 +18,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/nss_util_internal.h" #include "base/nss_util.h" +#include "base/nss_util_internal.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc index 7a4d41b..3b21466 100644 --- a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc +++ b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc @@ -10,12 +10,12 @@ #include "base/crypto/rsa_private_key.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/nss_util_internal.h" #include "base/nss_util.h" +#include "base/nss_util_internal.h" #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/owner_manager.h b/chrome/browser/chromeos/login/owner_manager.h index b4526b4..29d8d89 100644 --- a/chrome/browser/chromeos/login/owner_manager.h +++ b/chrome/browser/chromeos/login/owner_manager.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/crypto/rsa_private_key.h" #include "base/ref_counted.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/chromeos/cros/login_library.h" #include "chrome/browser/chromeos/login/owner_key_utils.h" -#include "chrome/browser/chrome_thread.h" class FilePath; class NotificationDetails; diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc index a700cc7..438c4ab 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.cc +++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/login/owner_manager_unittest.h" #include "chrome/browser/chromeos/login/owner_manager.h" +#include "chrome/browser/chromeos/login/owner_manager_unittest.h" #include <string> diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index f240d01..8a65070 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "gfx/canvas_skia.h" -#include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" +#include "third_party/skia/include/effects/SkGradientShader.h" #include "views/border.h" #include "views/painter.h" diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index f9fa9f4..1376278 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -10,11 +10,11 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" -#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h" #include "chrome/browser/chromeos/cros/mock_input_method_library.h" +#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h" +#include "chrome/browser/chromeos/login/mock_authenticator.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/screen_locker_tester.h" -#include "chrome/browser/chromeos/login/mock_authenticator.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/views/browser_dialogs.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index f2c844b..aeec099 100644 --- a/chrome/browser/chromeos/login/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/screen_locker_tester.cc @@ -9,13 +9,13 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/mock_authenticator.h" -#include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/screen_lock_view.h" +#include "chrome/browser/chromeos/login/screen_locker.h" #include "views/controls/button/button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget_gtk.h" #include "views/widget/root_view.h" +#include "views/widget/widget_gtk.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc index 74f7cd0..cd7423c 100644 --- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc @@ -5,10 +5,10 @@ #include "chrome/browser/chromeos/login/signed_settings_helper.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/chromeos/login/owner_manager.h" +#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/mock_ownership_service.h" +#include "chrome/browser/chromeos/login/owner_manager.h" #include "chrome/browser/chromeos/login/signed_settings.h" -#include "chrome/browser/chromeos/cros/cros_library.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc index 14b360c..fce9ea2 100644 --- a/chrome/browser/chromeos/login/signed_settings_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc @@ -10,10 +10,10 @@ #include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/browser/chromeos/login/mock_ownership_service.h" #include "chrome/browser/chromeos/login/owner_manager_unittest.h" -#include "chrome/browser/chromeos/cros/cros_library.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc index 36aadf0..2d44887 100644 --- a/chrome/browser/chromeos/login/user_image_view.cc +++ b/chrome/browser/chromeos/login/user_image_view.cc @@ -9,8 +9,8 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" -#include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/chromeos/login/helper.h" +#include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index d3150d3..fa0f5c0 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -14,8 +14,8 @@ #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/controls/throbber.h" #include "views/controls/link.h" +#include "views/controls/throbber.h" namespace { diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index ec4d6b4..5daf0c0 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -10,9 +10,9 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" -#include "chrome/common/pref_names.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" +#include "chrome/common/pref_names.h" // static WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() { diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 7ab1389..1bcb3ca 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -13,8 +13,8 @@ #include "app/resource_bundle.h" #include "base/command_line.h" -#include "base/logging.h" #include "base/file_util.h" +#include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" @@ -22,6 +22,7 @@ #include "chrome/browser/chromeos/cros/system_library.h" #include "chrome/browser/chromeos/customization_document.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" +#include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/login/account_screen.h" #include "chrome/browser/chromeos/login/apply_services_customization.h" #include "chrome/browser/chromeos/login/background_view.h" @@ -39,7 +40,6 @@ #include "chrome/browser/chromeos/login/user_image_screen.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" -#include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile_manager.h" diff --git a/chrome/browser/chromeos/network_state_notifier_browsertest.cc b/chrome/browser/chromeos/network_state_notifier_browsertest.cc index 6d4e2ec..4833d48 100644 --- a/chrome/browser/chromeos/network_state_notifier_browsertest.cc +++ b/chrome/browser/chromeos/network_state_notifier_browsertest.cc @@ -7,11 +7,11 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_registrar.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "chrome/common/notification_service.h" #include "chrome/test/ui_test_utils.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index fd59bf6..2b48256 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -10,9 +10,9 @@ #include "app/resource_bundle.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" #include "chrome/browser/chromeos/notifications/balloon_view.h" +#include "cros/chromeos_wm_ipc_enums.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" -#include "cros/chromeos_wm_ipc_enums.h" #include "views/background.h" #include "views/controls/native/native_view_host.h" #include "views/controls/scroll_view.h" diff --git a/chrome/browser/chromeos/notifications/notification_panel.h b/chrome/browser/chromeos/notifications/notification_panel.h index 7c9f759..96739bc 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.h +++ b/chrome/browser/chromeos/notifications/notification_panel.h @@ -8,8 +8,8 @@ #define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_NOTIFICATION_PANEL_H_ #pragma once -#include "base/task.h" #include "base/scoped_ptr.h" +#include "base/task.h" #include "chrome/browser/chromeos/frame/panel_controller.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/chromeos/offline/offline_load_service.cc b/chrome/browser/chromeos/offline/offline_load_service.cc index 63602f5..a000357 100644 --- a/chrome/browser/chromeos/offline/offline_load_service.cc +++ b/chrome/browser/chromeos/offline/offline_load_service.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chromeos/offline/offline_load_service.h" -#include "base/singleton.h" #include "base/ref_counted.h" -#include "chrome/common/notification_service.h" +#include "base/singleton.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/tab_contents/navigation_controller.h" +#include "chrome/common/notification_service.h" namespace chromeos { diff --git a/chrome/browser/chromeos/offline/offline_load_service.h b/chrome/browser/chromeos/offline/offline_load_service.h index 45baff6..d052d51 100644 --- a/chrome/browser/chromeos/offline/offline_load_service.h +++ b/chrome/browser/chromeos/offline/offline_load_service.h @@ -10,8 +10,8 @@ #include "base/ref_counted.h" #include "chrome/common/notification_observer.h" -#include "chrome/common/notification_type.h" #include "chrome/common/notification_registrar.h" +#include "chrome/common/notification_type.h" class GURL; class NavigationController; diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.cc b/chrome/browser/chromeos/options/language_hangul_config_view.cc index 14677f6..0e8227d 100644 --- a/chrome/browser/chromeos/options/language_hangul_config_view.cc +++ b/chrome/browser/chromeos/options/language_hangul_config_view.cc @@ -8,13 +8,13 @@ #include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "chrome/common/notification_type.h" -#include "chrome/common/pref_names.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/profile.h" +#include "chrome/common/notification_type.h" +#include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/chromeos/options/language_pinyin_config_view.cc b/chrome/browser/chromeos/options/language_pinyin_config_view.cc index 5a78752..2290f4e 100644 --- a/chrome/browser/chromeos/options/language_pinyin_config_view.cc +++ b/chrome/browser/chromeos/options/language_pinyin_config_view.cc @@ -6,13 +6,13 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/common/notification_type.h" -#include "chrome/common/pref_names.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/options/language_config_util.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/profile.h" +#include "chrome/common/notification_type.h" +#include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc index 81707ad..3cd9d40 100644 --- a/chrome/browser/chromeos/options/system_page_view.cc +++ b/chrome/browser/chromeos/options/system_page_view.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "app/combobox_model.h" +#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/string_util.h" diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc index f472858..a568341 100644 --- a/chrome/browser/chromeos/panels/panel_scroller.cc +++ b/chrome/browser/chromeos/panels/panel_scroller.cc @@ -9,9 +9,9 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "gfx/canvas.h" #include "chrome/browser/chromeos/panels/panel_scroller_container.h" #include "chrome/browser/chromeos/panels/panel_scroller_header.h" +#include "gfx/canvas.h" #include "views/widget/widget_gtk.h" struct PanelScroller::Panel { diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 9f90e2a..7c9e9a2 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -8,8 +8,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/keyboard_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" +#include "chrome/browser/chromeos/cros/keyboard_library.h" #include "chrome/browser/chromeos/cros/touchpad_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/prefs/pref_member.h" diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 899b88c..824b442 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/tab_closeable_state_watcher.h" #include "base/command_line.h" -#include "chrome/common/chrome_switches.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/defaults.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/update_browsertest.cc b/chrome/browser/chromeos/update_browsertest.cc index f8dc7bd..bbb67c3 100644 --- a/chrome/browser/chromeos/update_browsertest.cc +++ b/chrome/browser/chromeos/update_browsertest.cc @@ -4,13 +4,13 @@ #include "base/ref_counted.h" #include "base/utf_string_conversions.h" -#include "chrome/test/automation/dom_element_proxy.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/chromeos/update_observer.h" #include "chrome/browser/chromeos/cros/mock_update_library.h" +#include "chrome/browser/chromeos/update_observer.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" +#include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/chromeos/usb_mount_observer.h b/chrome/browser/chromeos/usb_mount_observer.h index 415c9c4..5f30b31 100644 --- a/chrome/browser/chromeos/usb_mount_observer.h +++ b/chrome/browser/chromeos/usb_mount_observer.h @@ -11,9 +11,9 @@ #include "chrome/browser/chromeos/cros/mount_library.h" #include "chrome/common/notification_observer.h" +#include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "chrome/common/notification_registrar.h" class Browser; class Profile; diff --git a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc b/chrome/browser/chromeos/usb_mount_observer_browsertest.cc index 3621067..e6a5c99 100644 --- a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc +++ b/chrome/browser/chromeos/usb_mount_observer_browsertest.cc @@ -4,7 +4,6 @@ #include "base/ref_counted.h" #include "base/utf_string_conversions.h" -#include "chrome/test/automation/dom_element_proxy.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/chromeos/cros/mock_mount_library.h" @@ -12,6 +11,7 @@ #include "chrome/browser/dom_ui/mediaplayer_ui.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" +#include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/chromeos/wm_ipc.cc b/chrome/browser/chromeos/wm_ipc.cc index 1bb9a52..1dd0af5 100644 --- a/chrome/browser/chromeos/wm_ipc.cc +++ b/chrome/browser/chromeos/wm_ipc.cc @@ -11,8 +11,8 @@ extern "C" { #include "app/x11_util.h" #include "base/logging.h" -#include "base/singleton.h" #include "base/scoped_ptr.h" +#include "base/singleton.h" namespace chromeos { diff --git a/chrome/browser/chromeos/wm_overview_fav_icon.cc b/chrome/browser/chromeos/wm_overview_fav_icon.cc index 0568932..dea1b0e 100644 --- a/chrome/browser/chromeos/wm_overview_fav_icon.cc +++ b/chrome/browser/chromeos/wm_overview_fav_icon.cc @@ -9,8 +9,8 @@ #include "app/x11_util.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/chromeos/wm_overview_snapshot.h" -#include "skia/ext/image_operations.h" #include "cros/chromeos_wm_ipc_enums.h" +#include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/wm_overview_snapshot.h b/chrome/browser/chromeos/wm_overview_snapshot.h index e411ee4..d6eeee0 100644 --- a/chrome/browser/chromeos/wm_overview_snapshot.h +++ b/chrome/browser/chromeos/wm_overview_snapshot.h @@ -7,9 +7,9 @@ #pragma once #include "third_party/skia/include/core/SkBitmap.h" +#include "views/controls/image_view.h" #include "views/view.h" #include "views/widget/widget_gtk.h" -#include "views/controls/image_view.h" class Browser; |