| 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_accessibility.h" | 5 #include "ash/system/tray_accessibility.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/accessibility_types.h" | 8 #include "ash/accessibility_types.h" |
| 9 #include "ash/resources/vector_icons/vector_icons.h" | 9 #include "ash/resources/vector_icons/vector_icons.h" |
| 10 #include "ash/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView); | 123 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView); |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 //////////////////////////////////////////////////////////////////////////////// | 126 //////////////////////////////////////////////////////////////////////////////// |
| 127 // ash::tray::AccessibilityPopupView | 127 // ash::tray::AccessibilityPopupView |
| 128 | 128 |
| 129 AccessibilityPopupView::AccessibilityPopupView(uint32_t enabled_state_bits) | 129 AccessibilityPopupView::AccessibilityPopupView(uint32_t enabled_state_bits) |
| 130 : label_(CreateLabel(enabled_state_bits)) {} | 130 : label_(CreateLabel(enabled_state_bits)) {} |
| 131 | 131 |
| 132 void AccessibilityPopupView::Init() { | 132 void AccessibilityPopupView::Init() { |
| 133 set_background(views::Background::CreateSolidBackground(kBackgroundColor)); | 133 set_background(views::Background::CreateThemedSolidBackground( |
| 134 this, ui::NativeTheme::kColorId_BubbleBackground)); |
| 134 | 135 |
| 135 views::GridLayout* layout = new views::GridLayout(this); | 136 views::GridLayout* layout = new views::GridLayout(this); |
| 136 SetLayoutManager(layout); | 137 SetLayoutManager(layout); |
| 137 | 138 |
| 138 views::ImageView* close_button = new views::ImageView(); | 139 views::ImageView* close_button = new views::ImageView(); |
| 139 close_button->SetImage( | 140 close_button->SetImage( |
| 140 ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE)); | 141 ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE)); |
| 141 close_button->SetHorizontalAlignment(views::ImageView::CENTER); | 142 close_button->SetHorizontalAlignment(views::ImageView::CENTER); |
| 142 close_button->SetVerticalAlignment(views::ImageView::CENTER); | 143 close_button->SetVerticalAlignment(views::ImageView::CENTER); |
| 143 | 144 |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 if (detailed_popup_) | 560 if (detailed_popup_) |
| 560 detailed_popup_->GetWidget()->Close(); | 561 detailed_popup_->GetWidget()->Close(); |
| 561 if (detailed_menu_) | 562 if (detailed_menu_) |
| 562 detailed_menu_->GetWidget()->Close(); | 563 detailed_menu_->GetWidget()->Close(); |
| 563 } | 564 } |
| 564 | 565 |
| 565 previous_accessibility_state_ = accessibility_state; | 566 previous_accessibility_state_ = accessibility_state; |
| 566 } | 567 } |
| 567 | 568 |
| 568 } // namespace ash | 569 } // namespace ash |
| OLD | NEW |