| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser_non_client_frame_view_ash.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
| 10 #include "ash/frame/default_header_painter.h" | 10 #include "ash/frame/default_header_painter.h" |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { | 461 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { |
| 462 command = IDC_SHOW_FAST_USER_SWITCHER; | 462 command = IDC_SHOW_FAST_USER_SWITCHER; |
| 463 } | 463 } |
| 464 chrome::ExecuteCommand(browser_view()->browser(), command); | 464 chrome::ExecuteCommand(browser_view()->browser(), command); |
| 465 } | 465 } |
| 466 | 466 |
| 467 /////////////////////////////////////////////////////////////////////////////// | 467 /////////////////////////////////////////////////////////////////////////////// |
| 468 // BrowserNonClientFrameViewAsh, protected: | 468 // BrowserNonClientFrameViewAsh, protected: |
| 469 | 469 |
| 470 // BrowserNonClientFrameView: | 470 // BrowserNonClientFrameView: |
| 471 void BrowserNonClientFrameViewAsh::UpdateNewStyleAvatar() { | 471 void BrowserNonClientFrameViewAsh::UpdateNewAvatarButtonImpl() { |
| 472 UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON); | 472 UpdateNewAvatarButton(this, NewAvatarButton::NATIVE_BUTTON); |
| 473 } | 473 } |
| 474 | 474 |
| 475 /////////////////////////////////////////////////////////////////////////////// | 475 /////////////////////////////////////////////////////////////////////////////// |
| 476 // BrowserNonClientFrameViewAsh, private: | 476 // BrowserNonClientFrameViewAsh, private: |
| 477 | 477 |
| 478 // views::NonClientFrameView: | 478 // views::NonClientFrameView: |
| 479 bool BrowserNonClientFrameViewAsh::DoesIntersectRect( | 479 bool BrowserNonClientFrameViewAsh::DoesIntersectRect( |
| 480 const views::View* target, | 480 const views::View* target, |
| 481 const gfx::Rect& rect) const { | 481 const gfx::Rect& rect) const { |
| 482 CHECK_EQ(target, this); | 482 CHECK_EQ(target, this); |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 691 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
| 692 } | 692 } |
| 693 | 693 |
| 694 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { | 694 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { |
| 695 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); | 695 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); |
| 696 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), | 696 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), |
| 697 width(), kClientEdgeThickness), | 697 width(), kClientEdgeThickness), |
| 698 ThemeProperties::GetDefaultColor( | 698 ThemeProperties::GetDefaultColor( |
| 699 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 699 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
| 700 } | 700 } |
| OLD | NEW |