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

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

Issue 2560953003: NOSUBMIT: Check on startup
Patch Set: Created 4 years 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile 56 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
57 // initialized. Otherwise, virtual keyboard extension will not load at login 57 // initialized. Otherwise, virtual keyboard extension will not load at login
58 // screen. 58 // screen.
59 keyboard::InitializeKeyboard(); 59 keyboard::InitializeKeyboard();
60 60
61 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); 61 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
62 #endif // defined(OS_CHROMEOS) 62 #endif // defined(OS_CHROMEOS)
63 } 63 }
64 64
65 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 65 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
66 CHECK(false) << "JAMES should be in logs";
66 if (chrome::IsRunningInMash()) { 67 if (chrome::IsRunningInMash()) {
67 DCHECK(!ash::Shell::HasInstance()); 68 DCHECK(!ash::Shell::HasInstance());
68 DCHECK(!ChromeLauncherController::instance()); 69 DCHECK(!ChromeLauncherController::instance());
69 chrome_launcher_controller_mus_ = 70 chrome_launcher_controller_mus_ =
70 base::MakeUnique<ChromeLauncherControllerMus>(); 71 base::MakeUnique<ChromeLauncherControllerMus>();
71 chrome_launcher_controller_mus_->Init(); 72 chrome_launcher_controller_mus_->Init();
72 } 73 }
73 74
74 cast_config_client_media_router_ = 75 cast_config_client_media_router_ =
75 base::MakeUnique<CastConfigClientMediaRouter>(); 76 base::MakeUnique<CastConfigClientMediaRouter>();
(...skipping 12 matching lines...) Expand all
88 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 89 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
89 #if defined(OS_CHROMEOS) 90 #if defined(OS_CHROMEOS)
90 vpn_list_forwarder_.reset(); 91 vpn_list_forwarder_.reset();
91 volume_controller_.reset(); 92 volume_controller_.reset();
92 new_window_client_.reset(); 93 new_window_client_.reset();
93 system_tray_client_.reset(); 94 system_tray_client_.reset();
94 cast_config_client_media_router_.reset(); 95 cast_config_client_media_router_.reset();
95 #endif 96 #endif
96 chrome::CloseAsh(); 97 chrome::CloseAsh();
97 } 98 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698