summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/views/frame/browser_header_painter_ash.cc4
-rw-r--r--chrome/browser/ui/views/frame/browser_header_painter_ash.h1
-rw-r--r--chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc2
3 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index 33d6aaf..7cbe56c 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -256,6 +256,10 @@ void BrowserHeaderPainterAsh::LayoutHeader() {
}
}
+int BrowserHeaderPainterAsh::GetHeaderHeight() const {
+ return caption_button_container_->height();
+}
+
int BrowserHeaderPainterAsh::GetHeaderHeightForPainting() const {
return painted_height_;
}
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.h b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
index ec172ca..3f4e7a9 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.h
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
@@ -46,6 +46,7 @@ class BrowserHeaderPainterAsh : public ash::HeaderPainter,
int GetMinimumHeaderWidth() const override;
void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
void LayoutHeader() override;
+ int GetHeaderHeight() const override;
int GetHeaderHeightForPainting() const override;
void SetHeaderHeightForPainting(int height) override;
void SchedulePaintForTitle() override;
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index f341dfc..ce87661 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -188,7 +188,7 @@ int BrowserNonClientFrameViewAsh::GetTopInset() const {
}
if (UsePackagedAppHeaderStyle() || UseWebAppHeaderStyle())
- return header_painter_->GetHeaderHeightForPainting();
+ return header_painter_->GetHeaderHeight();
int caption_buttons_bottom = caption_button_container_->bounds().bottom();