Decouple NavigationControllerImpl and WebContentsImpl.

Decouple NavigationControllerImpl and WebContentsImpl.

This CL is the first step in breaking dependencies between WebContents and navigation logic. It creates a NavigationControllerDelegate interface, which contains all the methods NavController needs to call on WebContentsImpl.
More details and roadmap of the changes to come are in https://docs.google.com/a/chromium.org/document/d/127ODQnXaoMtHdu2WXTR6iHg411bXa_8zRTb3kXlwArA/edit.

BUG=304341
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=230480

[nasko, 2013-10-22 18:00:36]

Hey Charlie,
I think this is ready to start reviewing. Take a look when you have a chance.
Thanks,
Nasko

[Charlie Reis, 2013-10-22 21:07:15]

Cool.  Mostly looks good, though I'm curious about the other web_contents
dependencies in navigation_controller_impl.cc.

https://codereview.chromium.org/29693008/diff/120001/content/browser/browser_...
File
content/browser/browser_plugin/browser_plugin_geolocation_permission_context.cc
(right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/browser_...
content/browser/browser_plugin/browser_plugin_geolocation_permission_context.cc:9:
#include "content/browser/web_contents/navigation_controller_delegate.h"
Looks like this is no longer needed.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_delegate.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_delegate.h:54: int32 page_id)
= 0;
nit: Wrong indent

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_impl.cc (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.cc:22: #include
"content/browser/web_contents/web_contents_impl.h"
Can we remove this include?

In fact, all of the browser/web_contents/ includes will have to go away before
we can move it to the frame_host directory.  We don't have to take care of them
all now, but the web_contents_impl.h one would make sense to remove here.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_impl.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:120: WebContents*
web_contents() const {
Looks like there's only 5 callers of this.  Perhaps it would be better to remove
WebContents from this .h file entirely and have a NavigationControllerDelegate*
delegate() instead?  (That will eventually become Navigator, most likely.)

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:209: // TODO(nasko):
Temporarily make this public, so WebContentsImpl can call it.
I'm curious why this is marked as temporary.  What's the plan for making it
private again in the future?

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:214: //friend class
WebContentsImpl;  // For invoking OnReservedPageIDRange.
Woo hoo!  Let's delete this line.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/web_contents_impl.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/web_contents_impl.h:486: //
NavigationControllerDelegate ----------------------------------------------
nit: Blank line after this, like NotificationObserver.

https://codereview.chromium.org/29693008/diff/120001/content/public/browser/w...
File content/public/browser/web_contents_observer.cc (right):

https://codereview.chromium.org/29693008/diff/120001/content/public/browser/w...
content/public/browser/web_contents_observer.cc:7: #include
"content/browser/web_contents/navigation_controller_delegate.h"
Probably not needed.

[nasko, 2013-10-22 21:56:20]

Thanks for the review. I've updated the CL based on the comments.

https://codereview.chromium.org/29693008/diff/120001/content/browser/browser_...
File
content/browser/browser_plugin/browser_plugin_geolocation_permission_context.cc
(right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/browser_...
content/browser/browser_plugin/browser_plugin_geolocation_permission_context.cc:9:
#include "content/browser/web_contents/navigation_controller_delegate.h"
On 2013/10/22 21:07:16, creis wrote:
> Looks like this is no longer needed.

Done.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_delegate.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_delegate.h:54: int32 page_id)
= 0;
On 2013/10/22 21:07:16, creis wrote:
> nit: Wrong indent

Done.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_impl.cc (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.cc:22: #include
"content/browser/web_contents/web_contents_impl.h"
On 2013/10/22 21:07:16, creis wrote:
> Can we remove this include?
> 
> In fact, all of the browser/web_contents/ includes will have to go away before
> we can move it to the frame_host directory.  We don't have to take care of
them
> all now, but the web_contents_impl.h one would make sense to remove here.

Yes, you are correct that we have to remove those. I'll do it in a separate CL,
if the file doesn't move with NavController. navigation_entry_impl.h for example
will just change paths, it won't be removed.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_impl.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:120: WebContents*
web_contents() const {
On 2013/10/22 21:07:16, creis wrote:
> Looks like there's only 5 callers of this.  Perhaps it would be better to
remove
> WebContents from this .h file entirely and have a
NavigationControllerDelegate*
> delegate() instead?  (That will eventually become Navigator, most likely.)

Done.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:209: // TODO(nasko):
Temporarily make this public, so WebContentsImpl can call it.
On 2013/10/22 21:07:16, creis wrote:
> I'm curious why this is marked as temporary.  What's the plan for making it
> private again in the future?

I'm not sure how things will shape once we move code to Navigator. It might
still stay public, at which point I'll remove the comment. I'd favor it compared
to making friend classes ; ).

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:214: //friend class
WebContentsImpl;  // For invoking OnReservedPageIDRange.
On 2013/10/22 21:07:16, creis wrote:
> Woo hoo!  Let's delete this line.

Done.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/web_contents_impl.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/web_contents_impl.h:486: //
NavigationControllerDelegate ----------------------------------------------
On 2013/10/22 21:07:16, creis wrote:
> nit: Blank line after this, like NotificationObserver.

Done.

https://codereview.chromium.org/29693008/diff/120001/content/public/browser/w...
File content/public/browser/web_contents_observer.cc (right):

https://codereview.chromium.org/29693008/diff/120001/content/public/browser/w...
content/public/browser/web_contents_observer.cc:7: #include
"content/browser/web_contents/navigation_controller_delegate.h"
On 2013/10/22 21:07:16, creis wrote:
> Probably not needed.

Done.

[Charlie Reis, 2013-10-22 22:24:35]

Great.  LGTM with one comment.

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
File content/browser/web_contents/navigation_controller_impl.h (right):

https://codereview.chromium.org/29693008/diff/120001/content/browser/web_cont...
content/browser/web_contents/navigation_controller_impl.h:209: // TODO(nasko):
Temporarily make this public, so WebContentsImpl can call it.
On 2013/10/22 21:56:20, nasko wrote:
> On 2013/10/22 21:07:16, creis wrote:
> > I'm curious why this is marked as temporary.  What's the plan for making it
> > private again in the future?
> 
> I'm not sure how things will shape once we move code to Navigator. It might
> still stay public, at which point I'll remove the comment. I'd favor it
compared
> to making friend classes ; ).

Certainly.  (I don't think I even realized it was private/friended when I added
DiscardPendingEntry.)

I'm guessing that it will have to remain public, though, so let's remove the
TODO.

[commit-bot: I haz the power, 2013-10-23 15:14:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/29693008/400001

[commit-bot: I haz the power, 2013-10-23 18:42:05]

Change committed as 230480