OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 5 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
6 | 6 |
7 #include "ash/common/keyboard/keyboard_ui.h" | 7 #include "ash/common/keyboard/keyboard_ui.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
10 #include "ash/common/shelf/wm_shelf_util.h" | 10 #include "ash/common/shelf/wm_shelf_util.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 } else { | 38 } else { |
39 gfx::ImageSkia* image_non_md = | 39 gfx::ImageSkia* image_non_md = |
40 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 40 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
41 IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD); | 41 IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD); |
42 button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md); | 42 button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md); |
43 } | 43 } |
44 button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, | 44 button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, |
45 views::ImageButton::ALIGN_MIDDLE); | 45 views::ImageButton::ALIGN_MIDDLE); |
46 | 46 |
47 tray_container()->AddChildView(button_); | 47 tray_container()->AddChildView(button_); |
| 48 button_->SetFocusBehavior(FocusBehavior::NEVER); |
48 SetContentsBackground(); | 49 SetContentsBackground(); |
49 // The Shell may not exist in some unit tests. | 50 // The Shell may not exist in some unit tests. |
50 if (Shell::HasInstance()) | 51 if (Shell::HasInstance()) |
51 Shell::GetInstance()->keyboard_ui()->AddObserver(this); | 52 Shell::GetInstance()->keyboard_ui()->AddObserver(this); |
52 } | 53 } |
53 | 54 |
54 VirtualKeyboardTray::~VirtualKeyboardTray() { | 55 VirtualKeyboardTray::~VirtualKeyboardTray() { |
55 // The Shell may not exist in some unit tests. | 56 // The Shell may not exist in some unit tests. |
56 if (Shell::HasInstance()) | 57 if (Shell::HasInstance()) |
57 Shell::GetInstance()->keyboard_ui()->RemoveObserver(this); | 58 Shell::GetInstance()->keyboard_ui()->RemoveObserver(this); |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 const ui::Event& event) { | 106 const ui::Event& event) { |
106 DCHECK_EQ(button_, sender); | 107 DCHECK_EQ(button_, sender); |
107 PerformAction(event); | 108 PerformAction(event); |
108 } | 109 } |
109 | 110 |
110 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { | 111 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { |
111 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); | 112 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); |
112 } | 113 } |
113 | 114 |
114 } // namespace ash | 115 } // namespace ash |
OLD | NEW |