chrome/browser/ui/views/tabs/media_indicator_button.cc - Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/tabs/media_indicator_button.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

« no previous file with comments | « chrome/browser/ui/views/tabs/media_indicator_button.h ('k') | chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h » ('j') | no next file with comments »

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 "chrome/browser/ui/views/tabs/media_indicator_button.h"	5 #include "chrome/browser/ui/views/tabs/media_indicator_button.h"

6	6

	7 #include "base/macros.h"

7 #include "chrome/browser/ui/views/tabs/tab.h"	8 #include "chrome/browser/ui/views/tabs/tab.h"

8 #include "chrome/browser/ui/views/tabs/tab_controller.h"	9 #include "chrome/browser/ui/views/tabs/tab_controller.h"

9 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"	10 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"

10 #include "content/public/browser/user_metrics.h"	11 #include "content/public/browser/user_metrics.h"

11 #include "ui/gfx/animation/animation_delegate.h"	12 #include "ui/gfx/animation/animation_delegate.h"

12 #include "ui/gfx/canvas.h"	13 #include "ui/gfx/canvas.h"

13 #include "ui/gfx/image/image.h"	14 #include "ui/gfx/image/image.h"

14	15

15 using base::UserMetricsAction;	16 using base::UserMetricsAction;

16	17

(...skipping 229 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
246 SkColor color = parent_tab_->button_color();	247 SkColor color = parent_tab_->button_color();

247 gfx::ImageSkia indicator_image =	248 gfx::ImageSkia indicator_image =

248 chrome::GetTabMediaIndicatorImage(state, color).AsImageSkia();	249 chrome::GetTabMediaIndicatorImage(state, color).AsImageSkia();

249 SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);	250 SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);

250 SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);	251 SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);

251 gfx::ImageSkia affordance_image =	252 gfx::ImageSkia affordance_image =

252 chrome::GetTabMediaIndicatorAffordanceImage(state, color).AsImageSkia();	253 chrome::GetTabMediaIndicatorAffordanceImage(state, color).AsImageSkia();

253 SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);	254 SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);

254 SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);	255 SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);

255 }	256 }

OLD	NEW