Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1155)

Unified Diff: chrome/browser/extensions/extension_tab_util.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
Index: chrome/browser/extensions/extension_tab_util.cc
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 2e85087485fba163af07211c6f0b66e1c0ccb9f7..142240b6119b8f1b37ec66e2983d3dad5ea493a2 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -94,7 +94,7 @@ Browser* CreateBrowser(ChromeUIThreadExtensionFunction* function,
int window_id,
std::string* error) {
content::WebContents* web_contents = function->GetAssociatedWebContents();
- chrome::HostDesktopType desktop_type =
+ ui::HostDesktopType desktop_type =
web_contents && web_contents->GetNativeView()
? chrome::GetHostDesktopTypeForNativeView(
web_contents->GetNativeView())
@@ -221,7 +221,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(
!IncognitoInfo::IsSplitMode(function->extension()) &&
browser->profile()->IsOffTheRecord()) {
Profile* profile = browser->profile()->GetOriginalProfile();
- chrome::HostDesktopType desktop_type = browser->host_desktop_type();
+ ui::HostDesktopType desktop_type = browser->host_desktop_type();
browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
if (!browser) {
@@ -591,7 +591,7 @@ void ExtensionTabUtil::CreateTab(WebContents* web_contents,
bool user_gesture) {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
- chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+ ui::HostDesktopType active_desktop = chrome::GetActiveDesktop();
Browser* browser = chrome::FindTabbedBrowser(profile, false, active_desktop);
const bool browser_created = !browser;
if (!browser)

Powered by Google App Engine
This is Rietveld 408576698