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

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

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12
Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 base::string16 ChromeShellDelegate::GetProductName() const { 164 base::string16 ChromeShellDelegate::GetProductName() const {
165 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); 165 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
166 } 166 }
167 167
168 void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const { 168 void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const {
169 Profile* profile = ProfileManager::GetActiveUserProfile(); 169 Profile* profile = ProfileManager::GetActiveUserProfile();
170 Browser* browser = chrome::FindTabbedBrowser(profile, false); 170 Browser* browser = chrome::FindTabbedBrowser(profile, false);
171 171
172 if (!browser) { 172 if (!browser) {
173 browser = new Browser( 173 browser = new Browser(Browser::CreateParams(profile));
174 Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_ASH));
175 browser->window()->Show(); 174 browser->window()->Show();
176 } 175 }
177 176
178 browser->window()->Activate(); 177 browser->window()->Activate();
179 178
180 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl), 179 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl),
181 ui::PAGE_TRANSITION_AUTO_BOOKMARK); 180 ui::PAGE_TRANSITION_AUTO_BOOKMARK);
182 params.disposition = SINGLETON_TAB; 181 params.disposition = SINGLETON_TAB;
183 chrome::Navigate(&params); 182 chrome::Navigate(&params);
184 } 183 }
(...skipping 27 matching lines...) Expand all
212 211
213 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 212 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
214 ash::VirtualKeyboardStateObserver* observer) { 213 ash::VirtualKeyboardStateObserver* observer) {
215 keyboard_state_observer_list_.AddObserver(observer); 214 keyboard_state_observer_list_.AddObserver(observer);
216 } 215 }
217 216
218 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 217 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
219 ash::VirtualKeyboardStateObserver* observer) { 218 ash::VirtualKeyboardStateObserver* observer) {
220 keyboard_state_observer_list_.RemoveObserver(observer); 219 keyboard_state_observer_list_.RemoveObserver(observer);
221 } 220 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698