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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.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
« no previous file with comments | « chrome/browser/chromeos/login/web_page_view.cc ('k') | chrome/browser/chromeos/media/media_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/webui_login_view.cc
===================================================================
--- chrome/browser/chromeos/login/webui_login_view.cc (revision 116331)
+++ chrome/browser/chromeos/login/webui_login_view.cc (working copy)
@@ -21,8 +21,8 @@
#include "chrome/browser/ui/views/dom_view.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/common/render_messages.h"
-#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/render_view_host_observer.h"
+#include "content/public/browser/web_contents.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"
@@ -148,10 +148,10 @@
webui_login_->Init(ProfileManager::GetDefaultProfile(), NULL);
webui_login_->SetVisible(true);
- TabContents* tab_contents = webui_login_->dom_contents()->tab_contents();
- tab_contents->SetDelegate(this);
+ WebContents* web_contents = webui_login_->dom_contents()->web_contents();
+ web_contents->SetDelegate(this);
- tab_watcher_.reset(new TabFirstRenderWatcher(tab_contents, this));
+ tab_watcher_.reset(new TabFirstRenderWatcher(web_contents, this));
}
std::string WebUILoginView::GetClassName() const {
@@ -209,7 +209,7 @@
}
WebUI* WebUILoginView::GetWebUI() {
- return webui_login_->dom_contents()->tab_contents()->GetWebUI();
+ return webui_login_->dom_contents()->web_contents()->GetWebUI();
}
void WebUILoginView::SetStatusAreaEnabled(bool enable) {
@@ -408,7 +408,7 @@
void WebUILoginView::ReturnFocus(bool reverse) {
// Return the focus to the web contents.
- webui_login_->dom_contents()->tab_contents()->
+ webui_login_->dom_contents()->web_contents()->
FocusThroughTabTraversal(reverse);
GetWidget()->Activate();
}
« no previous file with comments | « chrome/browser/chromeos/login/web_page_view.cc ('k') | chrome/browser/chromeos/media/media_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698