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

Unified Diff: content/shell/shell_aura.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/shell/shell.cc ('k') | content/shell/shell_devtools_frontend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_aura.cc
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index 2297587270c5e7b805e630d23e8b3904401f747e..f78c9e16946ddb87d4475b3e967ceea27238090e 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/utf_string_conversions.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
@@ -87,7 +88,7 @@ class ShellWindowDelegateView : public WidgetDelegateView,
contents_view_->SetLayoutManager(new FillLayout());
web_view_ = new WebView(web_contents->GetBrowserContext());
web_view_->SetWebContents(web_contents);
- web_contents->Focus();
+ web_contents->GetView()->Focus();
contents_view_->AddChildView(web_view_);
Layout();
}
« no previous file with comments | « content/shell/shell.cc ('k') | content/shell/shell_devtools_frontend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698