| Index: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| index 5e2391ff8370638d3d2e99f623ed125764b3276c..aa4e4a36af58ad1eb14dbd27377f1a8b31762a60 100644
|
| --- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| +++ b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| @@ -9,9 +9,12 @@
|
| #include "ash/common/keyboard/keyboard_ui.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/shelf/shelf_constants.h"
|
| +#include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/shelf/wm_shelf_util.h"
|
| +#include "ash/common/system/chromeos/session/logout_button_tray.h"
|
| #include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/system/tray/tray_utils.h"
|
| +#include "ash/common/system/view_observer.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "grit/ash_resources.h"
|
| #include "grit/ash_strings.h"
|
| @@ -25,8 +28,9 @@
|
|
|
| namespace ash {
|
|
|
| -VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf)
|
| - : TrayBackgroundView(wm_shelf), button_(nullptr) {
|
| +VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf,
|
| + ViewObserver* view_observer)
|
| + : TrayBackgroundView(wm_shelf, view_observer), button_(nullptr) {
|
| button_ = new views::ImageButton(this);
|
| if (MaterialDesignController::IsShelfMaterial()) {
|
| gfx::ImageSkia image_md =
|
| @@ -57,7 +61,6 @@ VirtualKeyboardTray::~VirtualKeyboardTray() {
|
|
|
| void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
|
| TrayBackgroundView::SetShelfAlignment(alignment);
|
| - tray_container()->SetBorder(views::Border::NullBorder());
|
|
|
| // Pad button size to align with other controls in the system tray.
|
| const gfx::ImageSkia image =
|
|
|