mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

web_contents_view.h has been hidden from user.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-27 10:44:58 +00:00
parent a98199511a
commit 9821cd1f58
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
brightray/browser/inspectable_web_contents.cc
View file

@ -2,18 +2,11 @@
#include "browser/inspectable_web_contents_impl.h" #include "browser/inspectable_web_contents_impl.h"
#include "content/public/browser/web_contents_view.h"
namespace brightray { namespace brightray {
InspectableWebContents* InspectableWebContents::Create( InspectableWebContents* InspectableWebContents::Create(
const content::WebContents::CreateParams& create_params) { const content::WebContents::CreateParams& create_params) {
auto contents = content::WebContents::Create(create_params); auto contents = content::WebContents::Create(create_params);
#if defined(OS_MACOSX)
// Work around http://crbug.com/279472.
contents->GetView()->SetAllowOverlappingViews(true);
#endif
return Create(contents); return Create(contents);
} }

3
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -21,7 +21,6 @@
#include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/devtools_http_handler.h" #include "content/public/browser/devtools_http_handler.h"
#include "content/public/browser/devtools_manager.h" #include "content/public/browser/devtools_manager.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
@ -152,7 +151,7 @@ void InspectableWebContentsImpl::CloseDevTools() {
if (devtools_web_contents_) { if (devtools_web_contents_) {
view_->CloseDevTools(); view_->CloseDevTools();
devtools_web_contents_.reset(); devtools_web_contents_.reset();
web_contents_->GetView()->Focus(); web_contents_->Focus();
} }
} }

1
brightray/browser/views/inspectable_web_contents_view_views.cc
View file

@ -3,7 +3,6 @@
#include "browser/inspectable_web_contents_impl.h" #include "browser/inspectable_web_contents_impl.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/web_contents_view.h"
#include "ui/views/controls/webview/webview.h" #include "ui/views/controls/webview/webview.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h" #include "ui/views/widget/widget_delegate.h"