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

Unified Diff: content/shell/shell.cc

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « content/public/test/web_contents_tester.cc ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell.cc
diff --git a/content/shell/shell.cc b/content/shell/shell.cc
index fe65fc1c82572290668f44ebe66c0f66712a4bdc..0a92aff947bd1a97e52a2ac269583484c8da836c 100644
--- a/content/shell/shell.cc
+++ b/content/shell/shell.cc
@@ -156,22 +156,22 @@ void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) {
PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR);
params.frame_name = frame_name;
web_contents_->GetController().LoadURLWithParams(params);
- web_contents_->Focus();
+ web_contents_->GetView()->Focus();
}
void Shell::GoBackOrForward(int offset) {
web_contents_->GetController().GoToOffset(offset);
- web_contents_->Focus();
+ web_contents_->GetView()->Focus();
}
void Shell::Reload() {
web_contents_->GetController().Reload(false);
- web_contents_->Focus();
+ web_contents_->GetView()->Focus();
}
void Shell::Stop() {
web_contents_->Stop();
- web_contents_->Focus();
+ web_contents_->GetView()->Focus();
}
void Shell::UpdateNavigationControls() {
@@ -201,7 +201,7 @@ void Shell::CloseDevTools() {
gfx::NativeView Shell::GetContentView() {
if (!web_contents_.get())
return NULL;
- return web_contents_->GetNativeView();
+ return web_contents_->GetView()->GetNativeView();
}
WebContents* Shell::OpenURLFromTab(WebContents* source,
« no previous file with comments | « content/public/test/web_contents_tester.cc ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698