ash/system/audio/tray_volume.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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: ash/system/audio/tray_volume.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « ash/ash.gyp ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/system/audio/tray_volume.h"	5 #include "ash/system/audio/tray_volume.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/system/tray/system_tray_delegate.h"	8 #include "ash/system/tray/system_tray_delegate.h"

9 #include "ash/system/tray/tray_constants.h"	9 #include "ash/system/tray/tray_constants.h"

10 #include "ash/system/tray/tray_views.h"	10 #include "ash/system/tray/tray_views.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "grit/ash_strings.h"	12 #include "grit/ash_strings.h"

13 #include "grit/ui_resources_standard.h"	13 #include "grit/ui_resources.h"

14 #include "third_party/skia/include/core/SkCanvas.h"	14 #include "third_party/skia/include/core/SkCanvas.h"

15 #include "third_party/skia/include/core/SkPaint.h"	15 #include "third_party/skia/include/core/SkPaint.h"

16 #include "third_party/skia/include/core/SkRect.h"	16 #include "third_party/skia/include/core/SkRect.h"

17 #include "third_party/skia/include/effects/SkGradientShader.h"	17 #include "third_party/skia/include/effects/SkGradientShader.h"

18 #include "ui/base/resource/resource_bundle.h"	18 #include "ui/base/resource/resource_bundle.h"

19 #include "ui/gfx/canvas.h"	19 #include "ui/gfx/canvas.h"

20 #include "ui/gfx/image/image.h"	20 #include "ui/gfx/image/image.h"

21 #include "ui/views/controls/button/image_button.h"	21 #include "ui/views/controls/button/image_button.h"

22 #include "ui/views/controls/image_view.h"	22 #include "ui/views/controls/image_view.h"

23 #include "ui/views/controls/label.h"	23 #include "ui/views/controls/label.h"

(...skipping 187 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211 percent = 0.0;	211 percent = 0.0;

212 volume_view_->SetVolumeLevel(percent);	212 volume_view_->SetVolumeLevel(percent);

213 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);	213 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);

214 return;	214 return;

215 }	215 }

216 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);	216 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);

217 }	217 }

218	218

219 } // namespace internal	219 } // namespace internal

220 } // namespace ash	220 } // namespace ash

OLD	NEW