chrome/browser/chromeos/status/network_dropdown_button.cc - Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos

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_dropdown_button.cc

Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Clang fixes + fixup Delegate 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

« chrome/browser/chromeos/login/background_view.cc ('K') | « chrome/browser/chromeos/status/memory_menu_button.cc ('k') | chrome/browser/chromeos/status/network_menu_button.h » ('j') | chrome/browser/chromeos/status/status_area_button.h » ('J')
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_dropdown_button.h"	5 #include "chrome/browser/chromeos/status/network_dropdown_button.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

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

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

10 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"	10 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"

11 #include "chrome/browser/chromeos/options/network_config_view.h"	11 #include "chrome/browser/chromeos/options/network_config_view.h"

12 #include "chrome/browser/chromeos/status/status_area_host.h"

13 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

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

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

16	15

17 namespace chromeos {	16 namespace chromeos {

18	17

19 ////////////////////////////////////////////////////////////////////////////////	18 ////////////////////////////////////////////////////////////////////////////////

20 // NetworkDropdownButton	19 // NetworkDropdownButton

21	20

22 NetworkDropdownButton::NetworkDropdownButton(bool is_browser_mode,	21 NetworkDropdownButton::NetworkDropdownButton(bool is_browser_mode,

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 // NetworkDropdownButton, private methods:	119 // NetworkDropdownButton, private methods:

121	120

122 void NetworkDropdownButton::SetNetworkIconAndText() {	121 void NetworkDropdownButton::SetNetworkIconAndText() {

123 string16 text;	122 string16 text;

124 const SkBitmap bitmap = network_icon_->GetIconAndText(&text);	123 const SkBitmap bitmap = network_icon_->GetIconAndText(&text);

125 SetIcon(bitmap);	124 SetIcon(bitmap);

126 SetText(text);	125 SetText(text);

127 }	126 }

128	127

129 } // namespace chromeos	128 } // namespace chromeos

OLD	NEW