Merge pull request #6482 from deepak1556/webcontents_navigation_obs_patch

author Cheng Zhao <zcbenz@gmail.com>

Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)

committer GitHub <noreply@github.com>

Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)
author Cheng Zhao <zcbenz@gmail.com>
Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)
committer GitHub <noreply@github.com>
Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)
diff --cc atom/browser/api/atom_api_web_contents.cc
Simple merge
diff --cc atom/browser/api/atom_api_web_contents.h
Simple merge
author	Cheng Zhao <zcbenz@gmail.com>
	Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)
committer	GitHub <noreply@github.com>
	Thu, 14 Jul 2016 03:57:26 +0000 (12:57 +0900)
		1	2
atom/browser/api/atom_api_web_contents.cc	patch \|	diff1 \|	diff2 \|	blob \| history
atom/browser/api/atom_api_web_contents.h	patch \|	diff1 \|	diff2 \|	blob \| history