chrome/browser/chromeos/enrollment_dialog_view.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/enrollment_dialog_view.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/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/chromeos/extensions/file_handler_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/enrollment_dialog_view.cc

diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc

index ea41927abd0ffe17f2e24498e5422ad683adf762..7b15796ea7172a5f6da78b5f189e3be4ff1fc37a 100644

--- a/chrome/browser/chromeos/enrollment_dialog_view.cc

+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/profiles/profile_manager.h"

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

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

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

#include "chrome/common/url_constants.h"

#include "content/public/common/page_transition_types.h"

#include "grit/generated_resources.h"

@@ -110,10 +111,14 @@ int EnrollmentDialogView::GetDialogButtons() const {

bool EnrollmentDialogView::Accept() {

// TODO(beng): use Navigate().

// Navigate to the target URI in a browser tab.

- Browser* browser = browser::FindTabbedBrowser(profile_, false);

+ Browser* browser = browser::FindTabbedBrowser(profile_, false,

+ chrome::HOST_DESKTOP_TYPE_ASH);

if (!browser) {

// Couldn't find a tabbed browser: create one.

- browser = new Browser(Browser::CreateParams(profile_));

+ browser = new Browser(

+ Browser::CreateParams(Browser::TYPE_TABBED,

+ profile_,

+ chrome::HOST_DESKTOP_TYPE_ASH));

}

DCHECK(browser);

chrome::AddSelectedTabWithURL(browser, target_uri_,