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

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

Issue 176883022: Shelf Cleanup (- binary files) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/system/session/logout_button_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/shelf/shelf_constants.h"
7 #include "ash/shell.h" 8 #include "ash/shell.h"
8 #include "ash/system/status_area_widget.h" 9 #include "ash/system/status_area_widget.h"
9 #include "ash/system/tray/system_tray_notifier.h" 10 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/system/tray/tray_constants.h" 11 #include "ash/system/tray/tray_constants.h"
11 #include "ash/system/tray/tray_utils.h" 12 #include "ash/system/tray/tray_utils.h"
12 #include "grit/ash_resources.h" 13 #include "grit/ash_resources.h"
13 #include "grit/ash_strings.h" 14 #include "grit/ash_strings.h"
14 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/events/event.h" 17 #include "ui/events/event.h"
(...skipping 19 matching lines...) Expand all
36 }; 37 };
37 38
38 VirtualKeyboardButton::VirtualKeyboardButton(views::ButtonListener* listener) 39 VirtualKeyboardButton::VirtualKeyboardButton(views::ButtonListener* listener)
39 : views::ImageButton(listener) { 40 : views::ImageButton(listener) {
40 } 41 }
41 42
42 VirtualKeyboardButton::~VirtualKeyboardButton() { 43 VirtualKeyboardButton::~VirtualKeyboardButton() {
43 } 44 }
44 45
45 gfx::Size VirtualKeyboardButton::GetPreferredSize() { 46 gfx::Size VirtualKeyboardButton::GetPreferredSize() {
46 const int virtual_keyboard_button_height = GetShelfItemHeight(); 47 const int virtual_keyboard_button_height = kShelfSize;
47 gfx::Size size = ImageButton::GetPreferredSize(); 48 gfx::Size size = ImageButton::GetPreferredSize();
48 int padding = virtual_keyboard_button_height - size.height(); 49 int padding = virtual_keyboard_button_height - size.height();
49 size.set_height(virtual_keyboard_button_height); 50 size.set_height(virtual_keyboard_button_height);
50 size.set_width(size.width() + padding); 51 size.set_width(size.width() + padding);
51 return size; 52 return size;
52 } 53 }
53 54
54 } // namespace 55 } // namespace
55 56
56 VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget) 57 VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 112 }
112 113
113 void VirtualKeyboardTray::OnAccessibilityModeChanged( 114 void VirtualKeyboardTray::OnAccessibilityModeChanged(
114 AccessibilityNotificationVisibility notify) { 115 AccessibilityNotificationVisibility notify) {
115 SetVisible(Shell::GetInstance()->accessibility_delegate()-> 116 SetVisible(Shell::GetInstance()->accessibility_delegate()->
116 IsVirtualKeyboardEnabled()); 117 IsVirtualKeyboardEnabled());
117 } 118 }
118 119
119 } // namespace internal 120 } // namespace internal
120 } // namespace ash 121 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/system/session/logout_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698