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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 47873003: Add a full screen virtual keyboard to virtual keyboard root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #endif 88 #endif
89 } 89 }
90 90
91 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 91 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
92 if (!ash::Shell::HasInstance()) 92 if (!ash::Shell::HasInstance())
93 return; 93 return;
94 94
95 // Initialize TabScrubber after the Ash Shell has been initialized. 95 // Initialize TabScrubber after the Ash Shell has been initialized.
96 TabScrubber::GetInstance(); 96 TabScrubber::GetInstance();
97 // Activate virtual keyboard after profile is initialized. It depends on the 97 // Activate virtual keyboard after profile is initialized. It depends on the
98 // default profile. 98 // default profile. If keyboard usability test flag is set, defer the
99 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 99 // activation to UpdateWindow() in virtual_keyboard_window_controller.cc.
100 ash::Shell::GetInstance()->keyboard_controller()); 100 if (!keyboard::IsKeyboardUsabilityTestEnabled()) {
101 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
102 ash::Shell::GetInstance()->keyboard_controller());
103 }
101 } 104 }
102 105
103 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 106 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
104 chrome::CloseAsh(); 107 chrome::CloseAsh();
105 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698