chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.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

« chrome/browser/task_manager/task_manager.cc ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('j') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

index a81064305e3a9f3249dd46926f26b160248586d4..71fb1ef7dfe2ae838d5faef92671ee498e46b423 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -44,6 +44,7 @@

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

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

@@ -1535,7 +1536,8 @@ gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {

Browser* InternetOptionsHandler::GetAppropriateBrowser() {

return browser::FindOrCreateTabbedBrowser(

- ProfileManager::GetDefaultProfileOrOffTheRecord());

+ ProfileManager::GetDefaultProfileOrOffTheRecord(),

+ chrome::HOST_DESKTOP_TYPE_ASH);

}

void InternetOptionsHandler::NetworkCommandCallback(const ListValue* args) {