| 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,
|
|
|