| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/common/system/user/user_view.h" | 5 #include "ash/common/system/user/user_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 public: | 269 public: |
| 270 ActiveUserBorder() {} | 270 ActiveUserBorder() {} |
| 271 ~ActiveUserBorder() override {} | 271 ~ActiveUserBorder() override {} |
| 272 | 272 |
| 273 // views::Border: | 273 // views::Border: |
| 274 void Paint(const views::View& view, gfx::Canvas* canvas) override { | 274 void Paint(const views::View& view, gfx::Canvas* canvas) override { |
| 275 canvas->FillRect( | 275 canvas->FillRect( |
| 276 gfx::Rect( | 276 gfx::Rect( |
| 277 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth, | 277 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth, |
| 278 view.width(), kSeparatorWidth), | 278 view.width(), kSeparatorWidth), |
| 279 kHorizontalSeparatorColor); | 279 kMenuSeparatorColor); |
| 280 } | 280 } |
| 281 | 281 |
| 282 gfx::Insets GetInsets() const override { | 282 gfx::Insets GetInsets() const override { |
| 283 return gfx::Insets(kMenuSeparatorVerticalPadding, | 283 return gfx::Insets(kMenuSeparatorVerticalPadding, |
| 284 kMenuExtraMarginFromLeftEdge, | 284 kMenuExtraMarginFromLeftEdge, |
| 285 kMenuSeparatorVerticalPadding * 2, 0); | 285 kMenuSeparatorVerticalPadding * 2, 0); |
| 286 } | 286 } |
| 287 | 287 |
| 288 gfx::Size GetMinimumSize() const override { return gfx::Size(); } | 288 gfx::Size GetMinimumSize() const override { return gfx::Size(); } |
| 289 | 289 |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 focus_manager_ = nullptr; | 695 focus_manager_ = nullptr; |
| 696 if (user_card_view_->GetFocusManager()) | 696 if (user_card_view_->GetFocusManager()) |
| 697 user_card_view_->GetFocusManager()->ClearFocus(); | 697 user_card_view_->GetFocusManager()->ClearFocus(); |
| 698 popup_message_.reset(); | 698 popup_message_.reset(); |
| 699 mouse_watcher_.reset(); | 699 mouse_watcher_.reset(); |
| 700 add_menu_option_.reset(); | 700 add_menu_option_.reset(); |
| 701 } | 701 } |
| 702 | 702 |
| 703 } // namespace tray | 703 } // namespace tray |
| 704 } // namespace ash | 704 } // namespace ash |
| OLD | NEW |