diff options
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/audio/tray_audio.cc | 1 | ||||
| -rw-r--r-- | ash/system/chromeos/audio/audio_detailed_view.cc | 3 | ||||
| -rw-r--r-- | ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc | 1 | ||||
| -rw-r--r-- | ash/system/tray/tray_notification_view.cc | 1 | ||||
| -rw-r--r-- | ash/system/user/accounts_detailed_view.cc | 1 | ||||
| -rw-r--r-- | ash/system/user/accounts_detailed_view.h | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc index 634463e..a3b32ca 100644 --- a/ash/system/audio/tray_audio.cc +++ b/ash/system/audio/tray_audio.cc @@ -21,7 +21,6 @@ #include "ash/volume_control_delegate.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" -#include "grit/ash_strings.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/ash/system/chromeos/audio/audio_detailed_view.cc b/ash/system/chromeos/audio/audio_detailed_view.cc index 3bc55ce..32493eb 100644 --- a/ash/system/chromeos/audio/audio_detailed_view.cc +++ b/ash/system/chromeos/audio/audio_detailed_view.cc @@ -9,7 +9,6 @@ #include "ash/system/tray/tray_constants.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/audio/cras_audio_handler.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -19,7 +18,7 @@ namespace { base::string16 GetAudioDeviceName(const chromeos::AudioDevice& device) { - switch(device.type) { + switch (device.type) { case chromeos::AUDIO_TYPE_HEADPHONE: return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_AUDIO_HEADPHONE); case chromeos::AUDIO_TYPE_INTERNAL_SPEAKER: diff --git a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc index 59f6ecf..709db28 100644 --- a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc +++ b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc @@ -6,7 +6,6 @@ #include "chromeos/audio/cras_audio_handler.h" #include "grit/ash_resources.h" -#include "grit/ash_strings.h" using chromeos::CrasAudioHandler; diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc index bf977f5..5cb2d16 100644 --- a/ash/system/tray/tray_notification_view.cc +++ b/ash/system/tray/tray_notification_view.cc @@ -6,7 +6,6 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" -#include "grit/ash_strings.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc index a89cfa1..28a5b43 100644 --- a/ash/system/user/accounts_detailed_view.cc +++ b/ash/system/user/accounts_detailed_view.cc @@ -19,6 +19,7 @@ #include "base/strings/utf_string_conversions.h" #include "components/user_manager/user_info.h" #include "grit/ash_resources.h" +#include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/border.h" diff --git a/ash/system/user/accounts_detailed_view.h b/ash/system/user/accounts_detailed_view.h index 99ee2b3..24dbd89 100644 --- a/ash/system/user/accounts_detailed_view.h +++ b/ash/system/user/accounts_detailed_view.h @@ -14,7 +14,6 @@ #include "ash/system/user/user_accounts_delegate.h" #include "ash/system/user/user_view.h" #include "base/macros.h" -#include "grit/ash_strings.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/label.h" |