chrome/browser/chromeos/status/network_menu.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/status/network_menu.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: Moving check_deps exception to specific_include_rules after chat with Kai. 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/options/network_config_view.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/status/network_menu.cc

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc

index 2fde2c776ad6ba8e0878ff4059e72f9475cdfa26..eeaac09ee7cae6f3ecdd633fae869bbcaa6ba919 100644

--- a/chrome/browser/chromeos/status/network_menu.cc

+++ b/chrome/browser/chromeos/status/network_menu.cc

@@ -26,6 +26,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/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

@@ -82,7 +83,8 @@ bool ShouldHighlightNetwork(const chromeos::Network* network) {

Browser* GetAppropriateBrowser() {

DCHECK(chromeos::UserManager::Get()->IsSessionStarted());

return browser::FindOrCreateTabbedBrowser(

- ProfileManager::GetDefaultProfileOrOffTheRecord());

+ ProfileManager::GetDefaultProfileOrOffTheRecord(),

+ chrome::HOST_DESKTOP_TYPE_ASH);

}

} // namespace

@@ -440,7 +442,8 @@ void NetworkMenuModel::ActivatedAt(int index) {

cros->DisconnectFromNetwork(active_vpn);

} else if (flags & FLAG_VIEW_ACCOUNT) {

Browser* browser = browser::FindOrCreateTabbedBrowser(

- ProfileManager::GetDefaultProfileOrOffTheRecord());

+ ProfileManager::GetDefaultProfileOrOffTheRecord(),

+ chrome::HOST_DESKTOP_TYPE_ASH);

chrome::ShowSingletonTab(browser, GURL(top_up_url_));

}