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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.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/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 7bf9b8c076c591b7dd1de2f6653ef8387f359755..8385f8e344550b2b71e2344630a899faa9dad537 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -795,7 +795,7 @@ gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
// pixel to show a border in the title bar, otherwise leave the size as zero
// height.
const int kAshBorderSpacing = 1;
- if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+ if (browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
size.Enlarge(0, kAshBorderSpacing);
} else {
const int kPopupBottomSpacingGlass = 1;
@@ -855,7 +855,7 @@ void ToolbarView::OnShowHomeButtonChanged() {
int ToolbarView::content_shadow_height() const {
ui::ThemeProvider* theme_provider = GetThemeProvider();
return theme_provider->GetDisplayProperty(
- browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH
+ browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH
? ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
: ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
}

Powered by Google App Engine
This is Rietveld 408576698