Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Side by Side Diff: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 11 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
OLDNEW
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 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 5 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
6 6
7 #include "base/memory/scoped_nsobject.h" 7 #include "base/memory/scoped_nsobject.h"
8 #include "content/browser/renderer_host/render_view_host.h" 8 #include "content/browser/renderer_host/render_view_host.h"
9 #include "content/browser/renderer_host/render_widget_host_view.h" 9 #include "content/browser/renderer_host/render_widget_host_view.h"
10 #include "content/browser/tab_contents/navigation_controller.h"
11 #include "content/browser/tab_contents/tab_contents.h" 10 #include "content/browser/tab_contents/tab_contents.h"
11 #include "content/public/browser/navigation_controller.h"
12 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
14 #include "content/public/browser/notification_details.h" 14 #include "content/public/browser/notification_details.h"
15 #include "content/public/browser/notification_source.h" 15 #include "content/public/browser/notification_source.h"
16 #include "content/public/browser/notification_types.h" 16 #include "content/public/browser/notification_types.h"
17 17
18 using content::WebContents; 18 using content::WebContents;
19 19
20 @interface TabContentsController(Private) 20 @interface TabContentsController(Private)
21 // Forwards frame update to |delegate_| (ResizeNotificationView calls it). 21 // Forwards frame update to |delegate_| (ResizeNotificationView calls it).
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // the view may have, so avoid changing the view hierarchy unless 205 // the view may have, so avoid changing the view hierarchy unless
206 // the view is different. 206 // the view is different.
207 if ([self tabContents] != updatedContents) { 207 if ([self tabContents] != updatedContents) {
208 [self changeTabContents:updatedContents]; 208 [self changeTabContents:updatedContents];
209 if ([self tabContents]) 209 if ([self tabContents])
210 [self ensureContentsVisible]; 210 [self ensureContentsVisible];
211 } 211 }
212 } 212 }
213 213
214 @end 214 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698