| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 PaintRestoredClientEdge(canvas); | 478 PaintRestoredClientEdge(canvas); |
| 479 } | 479 } |
| 480 | 480 |
| 481 // BrowserNonClientFrameView: | 481 // BrowserNonClientFrameView: |
| 482 bool OpaqueBrowserFrameView::ShouldPaintAsThemed() const { | 482 bool OpaqueBrowserFrameView::ShouldPaintAsThemed() const { |
| 483 // Theme app and popup windows if |platform_observer_| wants it. | 483 // Theme app and popup windows if |platform_observer_| wants it. |
| 484 return browser_view()->IsBrowserTypeNormal() || | 484 return browser_view()->IsBrowserTypeNormal() || |
| 485 platform_observer_->IsUsingSystemTheme(); | 485 platform_observer_->IsUsingSystemTheme(); |
| 486 } | 486 } |
| 487 | 487 |
| 488 void OpaqueBrowserFrameView::UpdateNewStyleAvatar() { | 488 void OpaqueBrowserFrameView::UpdateNewAvatarButtonImpl() { |
| 489 UpdateNewStyleAvatarInfo(this, NewAvatarButton::THEMED_BUTTON); | 489 UpdateNewAvatarButton(this, NewAvatarButton::THEMED_BUTTON); |
| 490 } | 490 } |
| 491 | 491 |
| 492 /////////////////////////////////////////////////////////////////////////////// | 492 /////////////////////////////////////////////////////////////////////////////// |
| 493 // OpaqueBrowserFrameView, private: | 493 // OpaqueBrowserFrameView, private: |
| 494 | 494 |
| 495 // views::NonClientFrameView: | 495 // views::NonClientFrameView: |
| 496 bool OpaqueBrowserFrameView::DoesIntersectRect(const views::View* target, | 496 bool OpaqueBrowserFrameView::DoesIntersectRect(const views::View* target, |
| 497 const gfx::Rect& rect) const { | 497 const gfx::Rect& rect) const { |
| 498 CHECK_EQ(target, this); | 498 CHECK_EQ(target, this); |
| 499 if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) { | 499 if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) { |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 client_area_bottom + kClientEdgeThickness - client_area_top), | 836 client_area_bottom + kClientEdgeThickness - client_area_top), |
| 837 toolbar_color); | 837 toolbar_color); |
| 838 canvas->FillRect(gfx::Rect(client_area_bounds.x(), client_area_bottom, | 838 canvas->FillRect(gfx::Rect(client_area_bounds.x(), client_area_bottom, |
| 839 client_area_bounds.width(), kClientEdgeThickness), | 839 client_area_bounds.width(), kClientEdgeThickness), |
| 840 toolbar_color); | 840 toolbar_color); |
| 841 canvas->FillRect(gfx::Rect(client_area_bounds.right(), client_area_top, | 841 canvas->FillRect(gfx::Rect(client_area_bounds.right(), client_area_top, |
| 842 kClientEdgeThickness, | 842 kClientEdgeThickness, |
| 843 client_area_bottom + kClientEdgeThickness - client_area_top), | 843 client_area_bottom + kClientEdgeThickness - client_area_top), |
| 844 toolbar_color); | 844 toolbar_color); |
| 845 } | 845 } |
| OLD | NEW |