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

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

Issue 2277563002: Wires up immersive mode for chrome and mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash Created 4 years, 4 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 (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/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "chrome/browser/chrome_browser_main.h" 14 #include "chrome/browser/chrome_browser_main.h"
14 #include "chrome/browser/ui/ash/ash_init.h" 15 #include "chrome/browser/ui/ash/ash_init.h"
15 #include "chrome/browser/ui/ash/ash_util.h" 16 #include "chrome/browser/ui/ash/ash_util.h"
16 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 17 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
18 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
19 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
17 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
18 #include "ui/aura/env.h" 21 #include "ui/aura/env.h"
19 #include "ui/keyboard/content/keyboard.h" 22 #include "ui/keyboard/content/keyboard.h"
20 #include "ui/keyboard/keyboard_controller.h" 23 #include "ui/keyboard/keyboard_controller.h"
21 24
22 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
23 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 26 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
24 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" 27 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
25 #endif 28 #endif
26 29
27 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} 30 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
28 31
29 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} 32 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
30 33
31 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 34 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
32 if (chrome::ShouldOpenAshOnStartup()) 35 if (chrome::ShouldOpenAshOnStartup())
33 chrome::OpenAsh(gfx::kNullAcceleratedWidget); 36 chrome::OpenAsh(gfx::kNullAcceleratedWidget);
34 37
38 if (chrome::IsRunningInMash()) {
39 immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
40 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
41 }
42
35 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
36 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile 44 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
37 // initialized. Otherwise, virtual keyboard extension will not load at login 45 // initialized. Otherwise, virtual keyboard extension will not load at login
38 // screen. 46 // screen.
39 keyboard::InitializeKeyboard(); 47 keyboard::InitializeKeyboard();
40 #endif 48 #endif
41 49
42 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
43 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); 51 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
44 #endif 52 #endif
(...skipping 10 matching lines...) Expand all
55 TabScrubber::GetInstance(); 63 TabScrubber::GetInstance();
56 // Activate virtual keyboard after profile is initialized. It depends on the 64 // Activate virtual keyboard after profile is initialized. It depends on the
57 // default profile. 65 // default profile.
58 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 66 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
59 keyboard::KeyboardController::GetInstance()); 67 keyboard::KeyboardController::GetInstance());
60 } 68 }
61 69
62 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 70 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
63 chrome::CloseAsh(); 71 chrome::CloseAsh();
64 } 72 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698