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

Unified Diff: chrome/browser/ui/browser.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/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 11e66f91dfbbcfaf30641b7d3214ba7e6c4503e9..3eba9bb8c35b36c4e8f61a6a084e1fa73af0ebfe 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -260,27 +260,25 @@ bool IsFastTabUnloadEnabled() {
// Browser, CreateParams:
Browser::CreateParams::CreateParams(Profile* profile,
- chrome::HostDesktopType host_desktop_type)
+ ui::HostDesktopType host_desktop_type)
: type(TYPE_TABBED),
profile(profile),
host_desktop_type(host_desktop_type),
trusted_source(false),
initial_show_state(ui::SHOW_STATE_DEFAULT),
is_session_restore(false),
- window(NULL) {
-}
+ window(NULL) {}
Browser::CreateParams::CreateParams(Type type,
Profile* profile,
- chrome::HostDesktopType host_desktop_type)
+ ui::HostDesktopType host_desktop_type)
: type(type),
profile(profile),
host_desktop_type(host_desktop_type),
trusted_source(false),
initial_show_state(ui::SHOW_STATE_DEFAULT),
is_session_restore(false),
- window(NULL) {
-}
+ window(NULL) {}
// static
Browser::CreateParams Browser::CreateParams::CreateForApp(
@@ -288,7 +286,7 @@ Browser::CreateParams Browser::CreateParams::CreateForApp(
bool trusted_source,
const gfx::Rect& window_bounds,
Profile* profile,
- chrome::HostDesktopType host_desktop_type) {
+ ui::HostDesktopType host_desktop_type) {
DCHECK(!app_name.empty());
CreateParams params(TYPE_POPUP, profile, host_desktop_type);
@@ -302,7 +300,7 @@ Browser::CreateParams Browser::CreateParams::CreateForApp(
// static
Browser::CreateParams Browser::CreateParams::CreateForDevTools(
Profile* profile,
- chrome::HostDesktopType host_desktop_type) {
+ ui::HostDesktopType host_desktop_type) {
CreateParams params(TYPE_POPUP, profile, host_desktop_type);
params.app_name = DevToolsWindow::kDevToolsApp;
params.trusted_source = true;
@@ -619,7 +617,7 @@ base::string16 Browser::GetWindowTitleForCurrentTab() const {
// On Ash, we don't want to suffix the page title with the application name,
// but on Windows, where USE_ASH can also be true, we still want the prefix
// on desktop.
- if (host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+ if (host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
return title;
#endif
// Don't append the app name to window titles on app frames and app popups

Powered by Google App Engine
This is Rietveld 408576698