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

Side by Side Diff: ash/shell/keyboard_controller_proxy_stub.cc

Issue 1050713002: aura: Remove layerless windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layerless: rebase Created 5 years, 8 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 | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shell/keyboard_controller_proxy_stub.h" 5 #include "ash/shell/keyboard_controller_proxy_stub.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/ime/mock_input_method.h" 10 #include "ui/base/ime/mock_input_method.h"
(...skipping 12 matching lines...) Expand all
23 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() { 23 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {
24 } 24 }
25 25
26 bool KeyboardControllerProxyStub::HasKeyboardWindow() const { 26 bool KeyboardControllerProxyStub::HasKeyboardWindow() const {
27 return keyboard_; 27 return keyboard_;
28 } 28 }
29 29
30 aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() { 30 aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
31 if (!keyboard_) { 31 if (!keyboard_) {
32 keyboard_.reset(new aura::Window(&delegate_)); 32 keyboard_.reset(new aura::Window(&delegate_));
33 keyboard_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 33 keyboard_->Init(ui::LAYER_NOT_DRAWN);
34 } 34 }
35 return keyboard_.get(); 35 return keyboard_.get();
36 } 36 }
37 37
38 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { 38 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
39 return Shell::GetInstance()->input_method_filter()->input_method(); 39 return Shell::GetInstance()->input_method_filter()->input_method();
40 } 40 }
41 41
42 void KeyboardControllerProxyStub::RequestAudioInput( 42 void KeyboardControllerProxyStub::RequestAudioInput(
43 WebContents* web_contents, 43 WebContents* web_contents,
44 const MediaStreamRequest& request, 44 const MediaStreamRequest& request,
45 const MediaResponseCallback& callback) { 45 const MediaResponseCallback& callback) {
46 } 46 }
47 47
48 void KeyboardControllerProxyStub::LoadSystemKeyboard() { 48 void KeyboardControllerProxyStub::LoadSystemKeyboard() {
49 } 49 }
50 50
51 void KeyboardControllerProxyStub::ReloadKeyboardIfNeeded() { 51 void KeyboardControllerProxyStub::ReloadKeyboardIfNeeded() {
52 } 52 }
53 53
54 } // namespace ash 54 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698