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

Side by Side Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2095933002: Revert of tabing inconsistencies between trays in status area (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert manually 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 26 matching lines...) Expand all
37 } else { 37 } else {
38 gfx::ImageSkia* image_non_md = 38 gfx::ImageSkia* image_non_md =
39 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 39 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
40 IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD); 40 IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD);
41 button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md); 41 button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md);
42 } 42 }
43 button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, 43 button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
44 views::ImageButton::ALIGN_MIDDLE); 44 views::ImageButton::ALIGN_MIDDLE);
45 45
46 tray_container()->AddChildView(button_); 46 tray_container()->AddChildView(button_);
47 button_->SetFocusBehavior(FocusBehavior::NEVER);
48 SetContentsBackground(); 47 SetContentsBackground();
49 // The Shell may not exist in some unit tests. 48 // The Shell may not exist in some unit tests.
50 if (Shell::HasInstance()) 49 if (Shell::HasInstance())
51 Shell::GetInstance()->keyboard_ui()->AddObserver(this); 50 Shell::GetInstance()->keyboard_ui()->AddObserver(this);
52 } 51 }
53 52
54 VirtualKeyboardTray::~VirtualKeyboardTray() { 53 VirtualKeyboardTray::~VirtualKeyboardTray() {
55 // The Shell may not exist in some unit tests. 54 // The Shell may not exist in some unit tests.
56 if (Shell::HasInstance()) 55 if (Shell::HasInstance())
57 Shell::GetInstance()->keyboard_ui()->RemoveObserver(this); 56 Shell::GetInstance()->keyboard_ui()->RemoveObserver(this);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const ui::Event& event) { 104 const ui::Event& event) {
106 DCHECK_EQ(button_, sender); 105 DCHECK_EQ(button_, sender);
107 PerformAction(event); 106 PerformAction(event);
108 } 107 }
109 108
110 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { 109 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) {
111 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); 110 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled());
112 } 111 }
113 112
114 } // namespace ash 113 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698