chrome/browser/chromeos/status/network_menu.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

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

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | « chrome/browser/chromeos/status/network_menu.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/status/network_menu.h"	5 #include "chrome/browser/chromeos/status/network_menu.h"

6	6

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

8	8

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

10 #include "ash/shell_delegate.h"	10 #include "ash/shell_delegate.h"

11 #include "ash/system/chromeos/network/network_icon.h"	11 #include "ash/system/chromeos/network/network_icon.h"

12 #include "base/bind.h"	12 #include "base/bind.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "base/stringprintf.h"	14 #include "base/strings/stringprintf.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

16 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"	16 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"

17 #include "chrome/browser/chromeos/login/user_manager.h"	17 #include "chrome/browser/chromeos/login/user_manager.h"

18 #include "chrome/browser/chromeos/mobile_config.h"	18 #include "chrome/browser/chromeos/mobile_config.h"

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

20 #include "chrome/browser/chromeos/options/network_connect.h"	20 #include "chrome/browser/chromeos/options/network_connect.h"

21 #include "chrome/browser/defaults.h"	21 #include "chrome/browser/defaults.h"

22 #include "chrome/browser/profiles/profile_manager.h"	22 #include "chrome/browser/profiles/profile_manager.h"

23 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

24 #include "chromeos/network/device_state.h"	24 #include "chromeos/network/device_state.h"

(...skipping 658 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
683 return main_menu_model_.get();	683 return main_menu_model_.get();

684 }	684 }

685	685

686 void NetworkMenu::UpdateMenu() {	686 void NetworkMenu::UpdateMenu() {

687 refreshing_menu_ = true;	687 refreshing_menu_ = true;

688 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());	688 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());

689 refreshing_menu_ = false;	689 refreshing_menu_ = false;

690 }	690 }

691	691

692 } // namespace chromeos	692 } // namespace chromeos

OLD	NEW