chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-review pass. Created 8 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 42e58eea2044e8f83498cef49a6a45111413bef8..8bf40b36fd1cbbd8344a84d4655fbfcf07015aed 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -61,6 +61,7 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/chrome_pages.h"

+#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/singleton_tabs.h"

#include "chrome/browser/upgrade_detector.h"

#include "chrome/common/chrome_notification_types.h"

@@ -703,7 +704,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

// browser window with an empty tab and returns it.

Browser* GetAppropriateBrowser() {

return browser::FindOrCreateTabbedBrowser(

- ProfileManager::GetDefaultProfileOrOffTheRecord());

+ ProfileManager::GetDefaultProfileOrOffTheRecord(),

+ chrome::HOST_DESKTOP_TYPE_ASH);

}

void SetProfile(Profile* profile) {