OLD | NEW |
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/system/tray/tray_views.h" | 5 #include "ash/system/tray/tray_views.h" |
6 | 6 |
7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
8 #include "third_party/skia/include/core/SkBitmap.h" | 8 #include "third_party/skia/include/core/SkBitmap.h" |
9 #include "grit/ash_strings.h" | 9 #include "grit/ash_strings.h" |
10 #include "grit/ui_resources.h" | 10 #include "grit/ui_resources.h" |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 bundle.GetImageNamed(enabled_resource_id).ToImageSkia()); | 334 bundle.GetImageNamed(enabled_resource_id).ToImageSkia()); |
335 SetToggledImage(views::CustomButton::BS_NORMAL, | 335 SetToggledImage(views::CustomButton::BS_NORMAL, |
336 bundle.GetImageNamed(disabled_resource_id).ToImageSkia()); | 336 bundle.GetImageNamed(disabled_resource_id).ToImageSkia()); |
337 SetImage(views::CustomButton::BS_HOT, | 337 SetImage(views::CustomButton::BS_HOT, |
338 bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia()); | 338 bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia()); |
339 SetToggledImage(views::CustomButton::BS_HOT, | 339 SetToggledImage(views::CustomButton::BS_HOT, |
340 bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia()); | 340 bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia()); |
341 SetImageAlignment(views::ImageButton::ALIGN_CENTER, | 341 SetImageAlignment(views::ImageButton::ALIGN_CENTER, |
342 views::ImageButton::ALIGN_MIDDLE); | 342 views::ImageButton::ALIGN_MIDDLE); |
343 set_focusable(true); | 343 set_focusable(true); |
344 | |
345 // TODO(sad): Turn animation back on once there are proper assets. | |
346 // http://crbug.com/119832 | |
347 set_animate_on_state_change(false); | |
348 } | 344 } |
349 | 345 |
350 TrayPopupHeaderButton::~TrayPopupHeaderButton() {} | 346 TrayPopupHeaderButton::~TrayPopupHeaderButton() {} |
351 | 347 |
352 gfx::Size TrayPopupHeaderButton::GetPreferredSize() { | 348 gfx::Size TrayPopupHeaderButton::GetPreferredSize() { |
353 return gfx::Size(ash::kTrayPopupItemHeight, ash::kTrayPopupItemHeight); | 349 return gfx::Size(ash::kTrayPopupItemHeight, ash::kTrayPopupItemHeight); |
354 } | 350 } |
355 | 351 |
356 void TrayPopupHeaderButton::OnPaintBorder(gfx::Canvas* canvas) { | 352 void TrayPopupHeaderButton::OnPaintBorder(gfx::Canvas* canvas) { |
357 // Just the left border. | 353 // Just the left border. |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 TrayNotificationView::~TrayNotificationView() { | 491 TrayNotificationView::~TrayNotificationView() { |
496 } | 492 } |
497 | 493 |
498 void TrayNotificationView::ButtonPressed(views::Button* sender, | 494 void TrayNotificationView::ButtonPressed(views::Button* sender, |
499 const views::Event& event) { | 495 const views::Event& event) { |
500 OnClose(); | 496 OnClose(); |
501 } | 497 } |
502 | 498 |
503 } // namespace internal | 499 } // namespace internal |
504 } // namespace ash | 500 } // namespace ash |
OLD | NEW |