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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 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
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/virtual_keyboard/virtual_keyboard_tray.h" 5 #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/common/keyboard/keyboard_ui.h" 9 #include "ash/keyboard/keyboard_ui.h"
10 #include "ash/common/shelf/shelf_constants.h"
11 #include "ash/common/shelf/wm_shelf.h"
12 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h"
14 #include "ash/resources/vector_icons/vector_icons.h" 10 #include "ash/resources/vector_icons/vector_icons.h"
11 #include "ash/shelf/shelf_constants.h"
12 #include "ash/shelf/wm_shelf.h"
15 #include "ash/strings/grit/ash_strings.h" 13 #include "ash/strings/grit/ash_strings.h"
16 #include "ash/system/tray/tray_constants.h" 14 #include "ash/system/tray/tray_constants.h"
15 #include "ash/wm_shell.h"
16 #include "ash/wm_window.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/display/display.h" 18 #include "ui/display/display.h"
19 #include "ui/events/event.h" 19 #include "ui/events/event.h"
20 #include "ui/gfx/image/image_skia.h" 20 #include "ui/gfx/image/image_skia.h"
21 #include "ui/gfx/paint_vector_icon.h" 21 #include "ui/gfx/paint_vector_icon.h"
22 #include "ui/keyboard/keyboard_controller.h" 22 #include "ui/keyboard/keyboard_controller.h"
23 #include "ui/views/controls/image_view.h" 23 #include "ui/views/controls/image_view.h"
24 24
25 namespace ash { 25 namespace ash {
26 26
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 116 }
117 117
118 void VirtualKeyboardTray::UnobserveKeyboardController() { 118 void VirtualKeyboardTray::UnobserveKeyboardController() {
119 keyboard::KeyboardController* keyboard_controller = 119 keyboard::KeyboardController* keyboard_controller =
120 keyboard::KeyboardController::GetInstance(); 120 keyboard::KeyboardController::GetInstance();
121 if (keyboard_controller) 121 if (keyboard_controller)
122 keyboard_controller->RemoveObserver(this); 122 keyboard_controller->RemoveObserver(this);
123 } 123 }
124 124
125 } // namespace ash 125 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/web_notification/ash_popup_alignment_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698