Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Side by Side Diff: ash/launcher/launcher_view.cc

Issue 10169038: ash: Fix missing launcher icon regression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/launcher/launcher_view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/launcher/launcher_view.h" 5 #include "ash/launcher/launcher_view.h"
6 6
7 #include "ash/launcher/launcher_button.h" 7 #include "ash/launcher/launcher_button.h"
8 #include "ash/launcher/launcher_delegate.h" 8 #include "ash/launcher/launcher_delegate.h"
9 #include "ash/launcher/launcher_icon_observer.h" 9 #include "ash/launcher/launcher_icon_observer.h"
10 #include "ash/launcher/launcher_model.h" 10 #include "ash/launcher/launcher_model.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 views::View* view) 223 views::View* view)
224 : launcher_view_(host), 224 : launcher_view_(host),
225 view_(view) {} 225 view_(view) {}
226 virtual ~StartFadeAnimationDelegate() {} 226 virtual ~StartFadeAnimationDelegate() {}
227 227
228 // AnimationDelegate overrides: 228 // AnimationDelegate overrides:
229 virtual void AnimationEnded(const Animation* animation) OVERRIDE { 229 virtual void AnimationEnded(const Animation* animation) OVERRIDE {
230 launcher_view_->FadeIn(view_); 230 launcher_view_->FadeIn(view_);
231 } 231 }
232 virtual void AnimationCanceled(const Animation* animation) OVERRIDE { 232 virtual void AnimationCanceled(const Animation* animation) OVERRIDE {
233 view_->SetVisible(true); 233 view_->layer()->SetOpacity(1.0f);
234 } 234 }
235 235
236 private: 236 private:
237 LauncherView* launcher_view_; 237 LauncherView* launcher_view_;
238 views::View* view_; 238 views::View* view_;
239 239
240 DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate); 240 DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate);
241 }; 241 };
242 242
243 LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate) 243 LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate)
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 source->GetWidget(), NULL, gfx::Rect(point, gfx::Size()), 902 source->GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
903 views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED) 903 views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED)
904 return; 904 return;
905 905
906 Shell::GetInstance()->UpdateShelfVisibility(); 906 Shell::GetInstance()->UpdateShelfVisibility();
907 #endif 907 #endif
908 } 908 }
909 909
910 } // namespace internal 910 } // namespace internal
911 } // namespace ash 911 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/launcher/launcher_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698