diff options
Diffstat (limited to 'chrome/browser/views/frame/browser_view2.cc')
| -rw-r--r-- | chrome/browser/views/frame/browser_view2.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc index af62587..8ef7dd3 100644 --- a/chrome/browser/views/frame/browser_view2.cc +++ b/chrome/browser/views/frame/browser_view2.cc @@ -150,6 +150,11 @@ bool BrowserView2::IsOffTheRecord() const { return browser_->profile()->IsOffTheRecord(); } +bool BrowserView2::ShouldShowOffTheRecordAvatar() const { + return IsOffTheRecord() && + browser_->GetType() == BrowserType::TABBED_BROWSER; +} + bool BrowserView2::AcceleratorPressed( const ChromeViews::Accelerator& accelerator) { DCHECK(accelerator_table_.get()); @@ -632,15 +637,6 @@ int BrowserView2::NonClientHitTest(const gfx::Point& point) { wi.cbSize = sizeof(wi); GetWindowInfo(frame_->GetWindow()->GetHWND(), &wi); - // Since we say that our client area extends to the top of the window (in - // the frame's WM_NCHITTEST handler. - CRect lb; - GetLocalBounds(&lb, true); - if (lb.PtInRect(point.ToPOINT())) { - if (point.y() < static_cast<int>(wi.cyWindowBorders)) - return HTTOP; - } - CPoint point_in_view_coords(point.ToPOINT()); View::ConvertPointToView(GetParent(), this, &point_in_view_coords); if (IsTabStripVisible() && tabstrip_->HitTest(point_in_view_coords) && |