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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_views.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <vector> 7 #include <vector>
8 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/media_delegate.h" 10 #include "ash/media_delegate.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 chrome::HOST_DESKTOP_TYPE_ASH); 218 chrome::HOST_DESKTOP_TYPE_ASH);
219 } else { 219 } else {
220 Browser* browser = 220 Browser* browser =
221 chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); 221 chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
222 if (browser && browser->is_type_tabbed()) { 222 if (browser && browser->is_type_tabbed()) {
223 chrome::AddTabAt(browser, GURL(), -1, true); 223 chrome::AddTabAt(browser, GURL(), -1, true);
224 return; 224 return;
225 } 225 }
226 226
227 chrome::ScopedTabbedBrowserDisplayer displayer( 227 chrome::ScopedTabbedBrowserDisplayer displayer(
228 ProfileManager::GetActiveUserProfile(), 228 ProfileManager::GetActiveUserProfile());
229 chrome::HOST_DESKTOP_TYPE_ASH);
230 chrome::AddTabAt(displayer.browser(), GURL(), -1, true); 229 chrome::AddTabAt(displayer.browser(), GURL(), -1, true);
231 } 230 }
232 break; 231 break;
233 } 232 }
234 case chrome::NOTIFICATION_ASH_SESSION_ENDED: 233 case chrome::NOTIFICATION_ASH_SESSION_ENDED:
235 break; 234 break;
236 default: 235 default:
237 NOTREACHED() << "Unexpected notification " << type; 236 NOTREACHED() << "Unexpected notification " << type;
238 } 237 }
239 } 238 }
240 239
241 void ChromeShellDelegate::PlatformInit() { 240 void ChromeShellDelegate::PlatformInit() {
242 #if defined(OS_WIN) 241 #if defined(OS_WIN)
243 registrar_.Add(this, 242 registrar_.Add(this,
244 chrome::NOTIFICATION_PROFILE_ADDED, 243 chrome::NOTIFICATION_PROFILE_ADDED,
245 content::NotificationService::AllSources()); 244 content::NotificationService::AllSources());
246 registrar_.Add(this, 245 registrar_.Add(this,
247 chrome::NOTIFICATION_ASH_SESSION_STARTED, 246 chrome::NOTIFICATION_ASH_SESSION_STARTED,
248 content::NotificationService::AllSources()); 247 content::NotificationService::AllSources());
249 registrar_.Add(this, 248 registrar_.Add(this,
250 chrome::NOTIFICATION_ASH_SESSION_ENDED, 249 chrome::NOTIFICATION_ASH_SESSION_ENDED,
251 content::NotificationService::AllSources()); 250 content::NotificationService::AllSources());
252 #endif 251 #endif
253 } 252 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698