Index: ash/shelf/shelf_view.cc |
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc |
index 07e812b4ac4eb4f9a5268e0da2a9999b35f5b722..0fd7a01774cdd96990fabb58ba4de2be130a7933 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 |