chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

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/extensions/api/tabs/tabs_api.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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/extensions/api/sessions/sessions_apitest.cc ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_api.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tabs/tabs_api.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc

index 6cb9c4fe6c5d53c5720d659ab0e54717db24e821..5bb896d8d7d0fd917897b99ceb341658c687564d 100644

--- a/chrome/browser/extensions/api/tabs/tabs_api.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

@@ -517,7 +517,7 @@ bool WindowsCreateFunction::RunSync() {

if (use_panels) {

create_panel = true;

// Non-ash supports both docked and detached panel types.

- if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&

+ if (chrome::GetActiveDesktop() != ui::HOST_DESKTOP_TYPE_ASH &&

create_data->type == windows::CREATE_TYPE_DETACHED_PANEL) {

panel_create_mode = PanelManager::CREATE_AS_DETACHED;

}

@@ -582,7 +582,7 @@ bool WindowsCreateFunction::RunSync() {

urls.push_back(GURL(chrome::kChromeUINewTabURL));

#if defined(USE_ASH)

- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {

+ if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) {

AppWindow::CreateParams create_params;

create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;

create_params.window_key = extension_id;

@@ -621,7 +621,7 @@ bool WindowsCreateFunction::RunSync() {

}

// Create a new BrowserWindow.

- chrome::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();

+ ui::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();

if (create_panel)

window_type = Browser::TYPE_POPUP;

Browser::CreateParams create_params(window_type, window_profile,