Issue 7994006: Merge requested by sheriff kliegs to fix chromeos test redness.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 7994006: Merge requested by sheriff kliegs to fix chromeos test redness. (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
3 years, 8 months ago by eblake1

Modified:
3 years, 8 months ago

Reviewers:
zel

CC:
chromium-reviews, cbentzel+watch_chromium.org, Paweł Hajdan Jr., kkania, davemoore+watch_chromium.org, stevenjb, darin-cc_chromium.org, brettw-cc_chromium.org

Base URL:
svn://svn.chromium.org/chrome/branches/889/src/

Visibility:
Public.

Description

Merge requested by sheriff kliegs to fix chromeos test redness. Merge 102209 - Removed chromeos::NetworkStateNotifier and redirected all related code to use net::NetworkChangeNotifier instead. BUG=chromium-os:20014 TEST=make sure hosted app loading is still respecting network online state changes Review URL: http://codereview.chromium.org/7969009 TBR=zelidrag@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=102293

Patch Set 1 #

Created: 3 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+60 lines, -399 lines)			Patch
M	chrome/browser/automation/testing_automation_provider_chromeos.cc	View	3 chunks	+3 lines, -4 lines	0 comments	Download
M	chrome/browser/chromeos/boot_times_loader.cc	View	1 chunk	+0 lines, -1 line	0 comments	Download
M	chrome/browser/chromeos/net/network_change_notifier_chromeos.cc	View	2 chunks	+5 lines, -2 lines	0 comments	Download
D	chrome/browser/chromeos/network_state_notifier.h	View	1 chunk	+0 lines, -92 lines	0 comments	Download
D	chrome/browser/chromeos/network_state_notifier.cc	View	1 chunk	+0 lines, -93 lines	0 comments	Download
D	chrome/browser/chromeos/network_state_notifier_browsertest.cc	View	1 chunk	+0 lines, -115 lines	0 comments	Download
M	chrome/browser/chromeos/offline/offline_load_page.h	View	3 chunks	+5 lines, -6 lines	0 comments	Download
M	chrome/browser/chromeos/offline/offline_load_page.cc	View	3 chunks	+13 lines, -24 lines	0 comments	Download
M	chrome/browser/chromeos/web_socket_proxy_controller.cc	View	2 chunks	+10 lines, -7 lines	0 comments	Download
M	chrome/browser/renderer_host/offline_resource_handler.cc	View	3 chunks	+2 lines, -2 lines	0 comments	Download
M	chrome/browser/sessions/session_restore.cc	View	7 chunks	+22 lines, -33 lines	0 comments	Download
M	chrome/browser/ui/browser_init.cc	View	2 chunks	+0 lines, -11 lines	0 comments	Download
M	chrome/chrome_browser.gypi	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	chrome/chrome_tests.gypi	View	1 chunk	+0 lines, -1 line	0 comments	Download
M	chrome/common/chrome_notification_types.h	View	1 chunk	+0 lines, -6 lines	0 comments	Download

Trybot results:

Messages

Total messages: 1 (0 generated)

Expand Messages | Collapse Messages