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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 1861013004: AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Rebase. Created 4 years, 8 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/content/gpu_support_impl.h" 9 #include "ash/content/gpu_support_impl.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_commands.h" 26 #include "chrome/browser/ui/browser_commands.h"
27 #include "chrome/browser/ui/browser_finder.h" 27 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/browser/ui/browser_navigator.h" 28 #include "chrome/browser/ui/browser_navigator.h"
29 #include "chrome/browser/ui/browser_navigator_params.h" 29 #include "chrome/browser/ui/browser_navigator_params.h"
30 #include "chrome/browser/ui/browser_tabstrip.h" 30 #include "chrome/browser/ui/browser_tabstrip.h"
31 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
32 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 32 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
33 #include "chrome/grit/chromium_strings.h" 33 #include "chrome/grit/chromium_strings.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #include "ui/app_list/shower/app_list_shower.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
37 38
38 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 40 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
40 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 41 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
41 #include "chrome/browser/chromeos/profiles/profile_helper.h" 42 #include "chrome/browser/chromeos/profiles/profile_helper.h"
42 #include "chrome/browser/chromeos/system/input_device_settings.h" 43 #include "chrome/browser/chromeos/system/input_device_settings.h"
43 #include "chrome/browser/profiles/profile.h" 44 #include "chrome/browser/profiles/profile.h"
44 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ProfileManager::GetActiveUserProfile()); 133 ProfileManager::GetActiveUserProfile());
133 chrome::AddSelectedTabWithURL(displayer.browser(), url, 134 chrome::AddSelectedTabWithURL(displayer.browser(), url,
134 ui::PAGE_TRANSITION_LINK); 135 ui::PAGE_TRANSITION_LINK);
135 136
136 // Since the ScopedTabbedBrowserDisplayer does not guarantee that the 137 // Since the ScopedTabbedBrowserDisplayer does not guarantee that the
137 // browser will be shown on the active desktop, we ensure the visibility. 138 // browser will be shown on the active desktop, we ensure the visibility.
138 multi_user_util::MoveWindowToCurrentDesktop( 139 multi_user_util::MoveWindowToCurrentDesktop(
139 displayer.browser()->window()->GetNativeWindow()); 140 displayer.browser()->window()->GetNativeWindow());
140 } 141 }
141 142
142 app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() { 143 app_list::AppListShower* ChromeShellDelegate::GetAppListShower() {
143 DCHECK(ash::Shell::HasInstance()); 144 DCHECK(ash::Shell::HasInstance());
144 return AppListServiceAsh::GetInstance()->GetViewDelegate( 145 return AppListServiceAsh::GetInstance()->GetAppListShower();
145 Profile::FromBrowserContext(GetActiveBrowserContext()));
146 } 146 }
147 147
148 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( 148 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
149 ash::ShelfModel* model) { 149 ash::ShelfModel* model) {
150 if (!shelf_delegate_) { 150 if (!shelf_delegate_) {
151 shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model); 151 shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
152 shelf_delegate_->Init(); 152 shelf_delegate_->Init();
153 } 153 }
154 return shelf_delegate_; 154 return shelf_delegate_;
155 } 155 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 221 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
222 ash::VirtualKeyboardStateObserver* observer) { 222 ash::VirtualKeyboardStateObserver* observer) {
223 keyboard_state_observer_list_.AddObserver(observer); 223 keyboard_state_observer_list_.AddObserver(observer);
224 } 224 }
225 225
226 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 226 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
227 ash::VirtualKeyboardStateObserver* observer) { 227 ash::VirtualKeyboardStateObserver* observer) {
228 keyboard_state_observer_list_.RemoveObserver(observer); 228 keyboard_state_observer_list_.RemoveObserver(observer);
229 } 229 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698