chrome/browser/chromeos/net/network_state_notifier.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/net/network_state_notifier.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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

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/net/network_state_notifier.h"	5 #include "chrome/browser/chromeos/net/network_state_notifier.h"

6	6

7 #include "ash/common/system/system_notifier.h"

8 #include "ash/resources/grit/ash_resources.h"	7 #include "ash/resources/grit/ash_resources.h"

	8 #include "ash/system/system_notifier.h"

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

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

11 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

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

14 #include "chrome/browser/chromeos/net/shill_error.h"	14 #include "chrome/browser/chromeos/net/shill_error.h"

15 #include "chrome/browser/ui/ash/system_tray_client.h"	15 #include "chrome/browser/ui/ash/system_tray_client.h"

16 #include "chrome/grit/generated_resources.h"	16 #include "chrome/grit/generated_resources.h"

17 #include "chromeos/network/network_configuration_handler.h"	17 #include "chromeos/network/network_configuration_handler.h"

18 #include "chromeos/network/network_connection_handler.h"	18 #include "chromeos/network/network_connection_handler.h"

(...skipping 421 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
440 weak_ptr_factory_.GetWeakPtr(), vpn->guid()));	440 weak_ptr_factory_.GetWeakPtr(), vpn->guid()));

441 }	441 }

442	442

443 void NetworkStateNotifier::ShowNetworkSettings(const std::string& network_id) {	443 void NetworkStateNotifier::ShowNetworkSettings(const std::string& network_id) {

444 if (!SystemTrayClient::Get())	444 if (!SystemTrayClient::Get())

445 return;	445 return;

446 SystemTrayClient::Get()->ShowNetworkSettings(network_id);	446 SystemTrayClient::Get()->ShowNetworkSettings(network_id);

447 }	447 }

448	448

449 } // namespace chromeos	449 } // namespace chromeos

OLD	NEW