Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: ash/common/system/user/user_view.cc

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 public: 295 public:
296 ActiveUserBorder() {} 296 ActiveUserBorder() {}
297 ~ActiveUserBorder() override {} 297 ~ActiveUserBorder() override {}
298 298
299 // views::Border: 299 // views::Border:
300 void Paint(const views::View& view, gfx::Canvas* canvas) override { 300 void Paint(const views::View& view, gfx::Canvas* canvas) override {
301 canvas->FillRect( 301 canvas->FillRect(
302 gfx::Rect( 302 gfx::Rect(
303 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth, 303 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth,
304 view.width(), kSeparatorWidth), 304 view.width(), kSeparatorWidth),
305 kHorizontalSeparatorColor); 305 kMenuSeparatorColor);
306 } 306 }
307 307
308 gfx::Insets GetInsets() const override { 308 gfx::Insets GetInsets() const override {
309 return gfx::Insets(kMenuSeparatorVerticalPadding, 309 return gfx::Insets(kMenuSeparatorVerticalPadding,
310 kMenuExtraMarginFromLeftEdge, 310 kMenuExtraMarginFromLeftEdge,
311 kMenuSeparatorVerticalPadding * 2, 0); 311 kMenuSeparatorVerticalPadding * 2, 0);
312 } 312 }
313 313
314 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 314 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
315 315
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 focus_manager_ = nullptr; 741 focus_manager_ = nullptr;
742 if (user_card_view_->GetFocusManager()) 742 if (user_card_view_->GetFocusManager())
743 user_card_view_->GetFocusManager()->ClearFocus(); 743 user_card_view_->GetFocusManager()->ClearFocus();
744 popup_message_.reset(); 744 popup_message_.reset();
745 mouse_watcher_.reset(); 745 mouse_watcher_.reset();
746 add_menu_option_.reset(); 746 add_menu_option_.reset();
747 } 747 }
748 748
749 } // namespace tray 749 } // namespace tray
750 } // namespace ash 750 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698