chrome/browser/chromeos/status/network_menu_icon.cc - Issue 8618013: Move accessibility_util.* from chrome/browser/chromeos to chrome/browser/chromeos/accessibility

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/chromeos/status/network_menu_icon.cc

Issue 8618013: Move accessibility_util.* from chrome/browser/chromeos to chrome/browser/chromeos/accessibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on ToT Created 9 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/chromeos/status/network_menu_icon.h"	5 #include "chrome/browser/chromeos/status/network_menu_icon.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9	9

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

11 #include "chrome/browser/chromeos/accessibility_util.h"	11 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

12 #include "chrome/browser/chromeos/cros/cros_library.h"	12 #include "chrome/browser/chromeos/cros/cros_library.h"

13 #include "grit/generated_resources.h"	13 #include "grit/generated_resources.h"

14 #include "grit/theme_resources.h"	14 #include "grit/theme_resources.h"

15 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

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

17 #include "ui/gfx/canvas_skia.h"	17 #include "ui/gfx/canvas_skia.h"

18 #include "ui/gfx/skbitmap_operations.h"	18 #include "ui/gfx/skbitmap_operations.h"

19	19

20 using std::max;	20 using std::max;

21 using std::min;	21 using std::min;

(...skipping 774 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
796	796

797 const SkBitmap NetworkMenuIcon::GetConnectedBitmap(BitmapType type) {	797 const SkBitmap NetworkMenuIcon::GetConnectedBitmap(BitmapType type) {

798 return GetBitmap(type, NumBitmaps(type) - 1);	798 return GetBitmap(type, NumBitmaps(type) - 1);

799 }	799 }

800	800

801 int NetworkMenuIcon::NumBitmaps(BitmapType type) {	801 int NetworkMenuIcon::NumBitmaps(BitmapType type) {

802 return (type == ARCS) ? kNumArcsImages : kNumBarsImages;	802 return (type == ARCS) ? kNumArcsImages : kNumBarsImages;

803 }	803 }

804	804

805 } // chromeos	805 } // chromeos

OLD	NEW