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

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

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: revert test change 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/multi_profile_uma.h" 10 #include "ash/common/multi_profile_uma.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 public: 181 public:
182 ActiveUserBorder() {} 182 ActiveUserBorder() {}
183 ~ActiveUserBorder() override {} 183 ~ActiveUserBorder() override {}
184 184
185 // views::Border: 185 // views::Border:
186 void Paint(const views::View& view, gfx::Canvas* canvas) override { 186 void Paint(const views::View& view, gfx::Canvas* canvas) override {
187 canvas->FillRect( 187 canvas->FillRect(
188 gfx::Rect( 188 gfx::Rect(
189 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth, 189 0, view.height() - kMenuSeparatorVerticalPadding - kSeparatorWidth,
190 view.width(), kSeparatorWidth), 190 view.width(), kSeparatorWidth),
191 kHorizontalSeparatorColor); 191 kMenuSeparatorColor);
192 } 192 }
193 193
194 gfx::Insets GetInsets() const override { 194 gfx::Insets GetInsets() const override {
195 return gfx::Insets(kMenuSeparatorVerticalPadding, 195 return gfx::Insets(kMenuSeparatorVerticalPadding,
196 kMenuExtraMarginFromLeftEdge, 196 kMenuExtraMarginFromLeftEdge,
197 kMenuSeparatorVerticalPadding * 2, 0); 197 kMenuSeparatorVerticalPadding * 2, 0);
198 } 198 }
199 199
200 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 200 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
201 201
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 return; 400 return;
401 focus_manager_->RemoveFocusChangeListener(this); 401 focus_manager_->RemoveFocusChangeListener(this);
402 focus_manager_ = nullptr; 402 focus_manager_ = nullptr;
403 if (user_card_view_->GetFocusManager()) 403 if (user_card_view_->GetFocusManager())
404 user_card_view_->GetFocusManager()->ClearFocus(); 404 user_card_view_->GetFocusManager()->ClearFocus();
405 add_menu_option_.reset(); 405 add_menu_option_.reset();
406 } 406 }
407 407
408 } // namespace tray 408 } // namespace tray
409 } // namespace ash 409 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_popup_utils.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698