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

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

Issue 34783006: Add --keyboard-usability-test flag and always show keyboard unless manually hide (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 7 years, 2 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
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/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 9 #include "ash/shell.h"
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
11 #include "chrome/browser/chrome_browser_main.h" 12 #include "chrome/browser/chrome_browser_main.h"
12 #include "chrome/browser/ui/ash/ash_init.h" 13 #include "chrome/browser/ui/ash/ash_init.h"
13 #include "chrome/browser/ui/ash/ash_util.h" 14 #include "chrome/browser/ui/ash/ash_util.h"
14 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 15 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
15 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
16 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 if (keyboard::IsKeyboardEnabled()) 82 if (keyboard::IsKeyboardEnabled())
82 keyboard::InitializeKeyboard(); 83 keyboard::InitializeKeyboard();
83 #endif 84 #endif
84 85
85 #if defined(FILE_MANAGER_EXTENSION) 86 #if defined(FILE_MANAGER_EXTENSION)
86 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); 87 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
87 #endif 88 #endif
88 } 89 }
89 90
90 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 91 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
92 if (!ash::Shell::HasInstance())
93 return;
94
91 // Initialize TabScrubber after the Ash Shell has been initialized. 95 // Initialize TabScrubber after the Ash Shell has been initialized.
92 if (ash::Shell::HasInstance()) 96 TabScrubber::GetInstance();
93 TabScrubber::GetInstance(); 97 // Activate virtual keyboard after profile is initialized. It depends on the
98 // default profile.
99 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
100 ash::Shell::GetInstance()->keyboard_controller());
94 } 101 }
95 102
96 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 103 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
97 chrome::CloseAsh(); 104 chrome::CloseAsh();
98 } 105 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc ('k') | ui/keyboard/keyboard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698