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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2095663004: Revert of mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
index 43caddff0a05db028b5d934e9fbc1b9397a7af47..5d56f12c3896ff677a9a7799e89ca7ecbbcec056 100644
--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
+++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
@@ -28,7 +28,8 @@
namespace ash {
VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)
- : TrayBackgroundView(status_area_widget->wm_shelf()), button_(nullptr) {
+ : TrayBackgroundView(status_area_widget),
+ button_(NULL) {
button_ = new views::ImageButton(this);
if (MaterialDesignController::IsShelfMaterial()) {
gfx::ImageSkia image_md =
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698