diff options
| author | thestig <thestig@chromium.org> | 2014-08-28 13:25:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 20:27:33 +0000 |
| commit | ba81a156269139419d7cc6af18f672a17a423e70 (patch) | |
| tree | 1c2a6f8de835b1d7e4a21526835f90fa67601998 /ash/shelf | |
| parent | 4b04efb439a19c6dfef213a2fe51751b223f9cbd (diff) | |
| download | chromium_src-ba81a156269139419d7cc6af18f672a17a423e70.zip chromium_src-ba81a156269139419d7cc6af18f672a17a423e70.tar.gz chromium_src-ba81a156269139419d7cc6af18f672a17a423e70.tar.bz2 | |
Cleanup: Remove misc unneeded grit includes.
Review URL: https://codereview.chromium.org/512663002
Cr-Commit-Position: refs/heads/master@{#292448}
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf.cc | 1 | ||||
| -rw-r--r-- | ash/shelf/shelf_view.cc | 9 | ||||
| -rw-r--r-- | ash/shelf/shelf_view_unittest.cc | 1 |
3 files changed, 4 insertions, 7 deletions
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" |