content/browser/geolocation/network_location_request.cc - Issue 6591034: Move core pieces of geolocation from chrome to content....

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: content/browser/geolocation/network_location_request.cc

Issue 6591034: Move core pieces of geolocation from chrome to content.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix Linux build Created 9 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 | Annotate | Revision Log

« chrome/chrome_browser.gypi ('K') | « content/browser/geolocation/network_location_request.h ('k') | content/browser/geolocation/osx_wifi.h » ('j') | no next file with comments »

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/geolocation/network_location_request.h"	5 #include "content/browser/geolocation/network_location_request.h"

6	6

7 #include "base/json/json_reader.h"	7 #include "base/json/json_reader.h"

8 #include "base/json/json_writer.h"	8 #include "base/json/json_writer.h"

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

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

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

12 #include "chrome/common/geoposition.h"	12 #include "chrome/common/geoposition.h"

13 #include "chrome/common/net/url_request_context_getter.h"	13 #include "chrome/common/net/url_request_context_getter.h"

14 #include "net/base/load_flags.h"	14 #include "net/base/load_flags.h"

15 #include "net/url_request/url_request_status.h"	15 #include "net/url_request/url_request_status.h"

(...skipping 427 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
443 gateway_data.router_data.begin();	443 gateway_data.router_data.begin();

444 iter != gateway_data.router_data.end();	444 iter != gateway_data.router_data.end();

445 iter++) {	445 iter++) {

446 DictionaryValue* gateway = new DictionaryValue;	446 DictionaryValue* gateway = new DictionaryValue;

447 AddString("mac_address", iter->mac_address, gateway);	447 AddString("mac_address", iter->mac_address, gateway);

448 gateways->Append(gateway);	448 gateways->Append(gateway);

449 }	449 }

450 body_object->Set("gateways", gateways);	450 body_object->Set("gateways", gateways);

451 }	451 }

452 } // namespace	452 } // namespace

OLD	NEW