ash/common/system/user/rounded_image_view.h - Issue 2498293003: CrOS md user row adjustments

Side by Side Diff: ash/common/system/user/rounded_image_view.h

Issue 2498293003: CrOS md user row adjustments (Closed)

Patch Set: more stuff Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 #ifndef ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_	5 #ifndef ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_

6 #define ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_	6 #define ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "ui/gfx/geometry/size.h"	9 #include "ui/gfx/geometry/size.h"

10 #include "ui/gfx/image/image_skia.h"	10 #include "ui/gfx/image/image_skia.h"

(...skipping 26 matching lines...) Expand all Loading...
37 void OnPaint(gfx::Canvas* canvas) override;	37 void OnPaint(gfx::Canvas* canvas) override;

38	38

39 private:	39 private:

40 gfx::ImageSkia image_;	40 gfx::ImageSkia image_;

41 gfx::ImageSkia resized_;	41 gfx::ImageSkia resized_;

42 gfx::Size image_size_;	42 gfx::Size image_size_;

43 int corner_radius_[4];	43 int corner_radius_[4];

44	44

45 // True if the given user is the active user and the icon should get	45 // True if the given user is the active user and the icon should get

46 // painted as active.	46 // painted as active.

	47 // TODO(estade): remove this, it's not used in Material Design.
	tdanderson 2016/11/16 23:08:08 nit: please add crbug.com/614453 nit: please add crbug.com/614453 Evan Stade 2016/11/17 00:37:50 so the reason I don't add that religiously is beca Show quoted text On 2016/11/16 23:08:08, tdanderson wrote: > nit: please add crbug.com/614453 so the reason I don't add that religiously is because I have a pretty good grasp of how to remove pre-md stuff --- I had a whole lot of practice on top Chrome --- and as long as the word "material" is somewhere nearby, it won't be hard to grep for. On the other hand, if all you ever grep for is that bug number, you'll miss a whole lot of stuff that should be removed. tdanderson 2016/11/17 01:40:15 The plan is to grep for a) places that are gated w Show quoted text On 2016/11/17 00:37:50, Evan Stade wrote: > On 2016/11/16 23:08:08, tdanderson wrote: > > nit: please add crbug.com/614453 > > so the reason I don't add that religiously is because I have a pretty good grasp > of how to remove pre-md stuff --- I had a whole lot of practice on top Chrome > --- and as long as the word "material" is somewhere nearby, it won't be hard to > grep for. > > On the other hand, if all you ever grep for is that bug number, you'll miss a > whole lot of stuff that should be removed. The plan is to grep for a) places that are gated with something in MaterialDesignController, and b) the bug number. If this is something that is in your opinion easily discovered with a) (even if you are not necessarily the one who will be doing the cleanup in this file) then please disregard (now and in all future times I may make the same suggestion). Evan Stade 2016/11/17 01:54:18 one reason a) and b) are not sufficient alone is b Show quoted text On 2016/11/17 01:40:15, tdanderson wrote: > On 2016/11/17 00:37:50, Evan Stade wrote: > > On 2016/11/16 23:08:08, tdanderson wrote: > > > nit: please add crbug.com/614453 > > > > so the reason I don't add that religiously is because I have a pretty good > grasp > > of how to remove pre-md stuff --- I had a whole lot of practice on top Chrome > > --- and as long as the word "material" is somewhere nearby, it won't be hard > to > > grep for. > > > > On the other hand, if all you ever grep for is that bug number, you'll miss a > > whole lot of stuff that should be removed. > > The plan is to grep for a) places that are gated with something in > MaterialDesignController, and b) the bug number. If this is something that is in > your opinion easily discovered with a) (even if you are not necessarily the one > who will be doing the cleanup in this file) then please disregard (now and in > all future times I may make the same suggestion). one reason a) and b) are not sufficient alone is because as you change code you need to change a lot of comments as well. Many comments reference differences between MD and non-MD, but do not reference that bug, and the compiler would not complain if you removed IsShelfMaterial() but didn't touch the comments. Thus I think the best approach is grepping for "material" and "md" (which covers comments, function names like DoFooMd, and MaterialDesignController::IsFooMaterial, and has very few false positives), and making sure that grepping for those two things is sufficient. At that point, the bug number is superfluous.
47 bool active_user_;	48 bool active_user_;

48	49

49 DISALLOW_COPY_AND_ASSIGN(RoundedImageView);	50 DISALLOW_COPY_AND_ASSIGN(RoundedImageView);

50 };	51 };

51	52

52 } // namespace tray	53 } // namespace tray

53 } // namespace ash	54 } // namespace ash

54	55

55 #endif // ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_	56 #endif // ASH_COMMON_SYSTEM_USER_ROUNDED_IMAGE_VIEW_H_

OLD	NEW

« no previous file with comments | « ash/common/system/tray/tray_popup_utils.cc ('k') | ash/common/system/user/rounded_image_view.cc » ('j') | ash/common/system/user/user_card_view.cc » ('J')