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

Unified Diff: chrome/browser/automation/automation_provider_observers.cc

Issue 9030032: Get rid of a bunch of tab_contents.h includes from chrome. These are all trivial changes to use W... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 8 years, 12 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/automation_provider_observers.cc
===================================================================
--- chrome/browser/automation/automation_provider_observers.cc (revision 116331)
+++ chrome/browser/automation/automation_provider_observers.cc (working copy)
@@ -76,10 +76,10 @@
#include "chrome/common/extensions/extension.h"
#include "content/browser/download/save_package.h"
#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/common/process_type.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -394,7 +394,7 @@
if (type == notification_) {
if (type == content::NOTIFICATION_TAB_PARENTED) {
ObserveTab(&(content::Source<TabContentsWrapper>(source).ptr()->
- tab_contents()->GetController()));
+ web_contents()->GetController()));
} else {
ObserveTab(content::Source<NavigationController>(source).ptr());
}
@@ -2675,7 +2675,7 @@
browser->GetTabContentsWrapperAt(i);
StartObserving(contents_wrapper->automation_tab_helper());
if (contents_wrapper->automation_tab_helper()->has_pending_loads())
- pending_tabs_.insert(contents_wrapper->tab_contents());
+ pending_tabs_.insert(contents_wrapper->web_contents());
}
}
CheckIfNoMorePendingLoads();
@@ -2753,7 +2753,7 @@
DCHECK_EQ(content::NOTIFICATION_TAB_PARENTED, type);
NavigationController* controller =
&(content::Source<TabContentsWrapper>(source).ptr()->
- tab_contents()->GetController());
+ web_contents()->GetController());
if (automation_) {
// TODO(phajdan.jr): Clean up this hack. We write the correct return type
// here, but don't send the message. NavigationNotificationObserver
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/background/background_contents_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698