Cleanup: Remove misc unneeded grit includes.

Review URL: https://codereview.chromium.org/512663002

Cr-Commit-Position: refs/heads/master@{#292448}

12 files changed, 6 insertions, 16 deletions

diff --git a/ash/frame/default_header_painter_unittest.cc b/ash/frame/default_header_painter_unittest.cc
index 2768297..41ec4ff 100644
--- a/ash/frame/default_header_painter_unittest.cc
+++ b/ash/frame/default_header_painter_unittest.cc
@@ -9,7 +9,6 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "base/memory/scoped_ptr.h"
-#include "grit/ash_resources.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 100fb04..0a02248 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -23,7 +23,6 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
-#include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index 07e812b..0fd7a01 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -32,7 +32,6 @@
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
-#include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/client/screen_position_client.h"
@@ -116,7 +115,7 @@ namespace {
 // A class to temporarily disable a given bounds animator.
 class BoundsAnimatorDisabler {
  public:
-  BoundsAnimatorDisabler(views::BoundsAnimator* bounds_animator)
+  explicit BoundsAnimatorDisabler(views::BoundsAnimator* bounds_animator)
       : old_duration_(bounds_animator->GetAnimationDuration()),
         bounds_animator_(bounds_animator) {
     bounds_animator_->SetAnimationDuration(1);
@@ -431,7 +430,7 @@ void ShelfView::Init() {
 void ShelfView::OnShelfAlignmentChanged() {
   overflow_button_->OnShelfAlignmentChanged();
   LayoutToIdealBounds();
-  for (int i=0; i < view_model_->view_size(); ++i) {
+  for (int i = 0; i < view_model_->view_size(); ++i) {
     if (i >= first_visible_index_ && i <= last_visible_index_)
       view_model_->view_at(i)->Layout();
   }
@@ -659,9 +658,9 @@ void ShelfView::EndDrag(bool cancel) {
       drag_and_drop_view, ShelfButtonHost::DRAG_AND_DROP, cancel);
 
   // Either destroy the temporarily created item - or - make the item visible.
-  if (drag_and_drop_item_pinned_ && cancel)
+  if (drag_and_drop_item_pinned_ && cancel) {
     delegate_->UnpinAppWithID(drag_and_drop_app_id_);
-  else if (drag_and_drop_view) {
+  } else if (drag_and_drop_view) {
     if (cancel) {
       // When a hosted drag gets canceled, the item can remain in the same slot
       // and it might have moved within the bounds. In that case the item need
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index e4a79f7..5fa973a 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -34,7 +34,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
-#include "grit/ash_resources.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/shell/shelf_delegate_impl.cc b/ash/shell/shelf_delegate_impl.cc
index bc4af4e..dfebf94 100644
--- a/ash/shell/shelf_delegate_impl.cc
+++ b/ash/shell/shelf_delegate_impl.cc
@@ -9,7 +9,6 @@
 #include "ash/shell/window_watcher.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/string_util.h"
-#include "grit/ash_resources.h"
 
 namespace ash {
 namespace shell {
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"
 
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc
index e325610..490fc06 100644
--- a/ash/test/test_shelf_delegate.cc
+++ b/ash/test/test_shelf_delegate.cc
@@ -11,7 +11,6 @@
 #include "ash/test/test_shelf_item_delegate.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 
 namespace ash {