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

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

Issue 2833173002: mash: Support ShelfModel access in Chrome. (Closed)
Patch Set: Address comments; fix test failures. Created 3 years, 6 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/public/cpp/mus_property_mirror_ash.h" 7 #include "ash/public/cpp/mus_property_mirror_ash.h"
8 #include "ash/public/cpp/window_pin_type.h" 8 #include "ash/public/cpp/window_pin_type.h"
9 #include "ash/public/cpp/window_properties.h" 9 #include "ash/public/cpp/window_properties.h"
10 #include "ash/public/interfaces/window_pin_type.mojom.h" 10 #include "ash/public/interfaces/window_pin_type.mojom.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // screen. 95 // screen.
96 keyboard::InitializeKeyboard(); 96 keyboard::InitializeKeyboard();
97 97
98 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); 98 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
99 } 99 }
100 100
101 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 101 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
102 if (ash_util::IsRunningInMash()) { 102 if (ash_util::IsRunningInMash()) {
103 DCHECK(!ash::Shell::HasInstance()); 103 DCHECK(!ash::Shell::HasInstance());
104 DCHECK(!ChromeLauncherController::instance()); 104 DCHECK(!ChromeLauncherController::instance());
105 // TODO(crbug.com/557406): Synchronize this ShelfModel with the one in Ash.
106 chrome_shelf_model_ = base::MakeUnique<ash::ShelfModel>(); 105 chrome_shelf_model_ = base::MakeUnique<ash::ShelfModel>();
107 chrome_launcher_controller_ = base::MakeUnique<ChromeLauncherController>( 106 chrome_launcher_controller_ = base::MakeUnique<ChromeLauncherController>(
108 nullptr, chrome_shelf_model_.get()); 107 nullptr, chrome_shelf_model_.get());
109 chrome_launcher_controller_->Init(); 108 chrome_launcher_controller_->Init();
110 chrome_shell_content_state_ = base::MakeUnique<ChromeShellContentState>(); 109 chrome_shell_content_state_ = base::MakeUnique<ChromeShellContentState>();
111 } 110 }
112 111
113 cast_config_client_media_router_ = 112 cast_config_client_media_router_ =
114 base::MakeUnique<CastConfigClientMediaRouter>(); 113 base::MakeUnique<CastConfigClientMediaRouter>();
115 media_client_ = base::MakeUnique<MediaClient>(); 114 media_client_ = base::MakeUnique<MediaClient>();
(...skipping 17 matching lines...) Expand all
133 volume_controller_.reset(); 132 volume_controller_.reset();
134 new_window_client_.reset(); 133 new_window_client_.reset();
135 system_tray_client_.reset(); 134 system_tray_client_.reset();
136 lock_screen_client_.reset(); 135 lock_screen_client_.reset();
137 media_client_.reset(); 136 media_client_.reset();
138 cast_config_client_media_router_.reset(); 137 cast_config_client_media_router_.reset();
139 session_controller_client_.reset(); 138 session_controller_client_.reset();
140 139
141 ash_init_.reset(); 140 ash_init_.reset();
142 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698