This commit is contained in:
Heilig Benedek 2017-11-03 00:42:30 +01:00 committed by Cheng Zhao
parent 193beb57c9
commit 4b10445c2e
5 changed files with 9 additions and 9 deletions

View file

@ -242,7 +242,7 @@ void CommonWebContentsDelegate::RunFileChooser(
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const content::FileChooserParams& params) { const content::FileChooserParams& params) {
if (!web_dialog_helper_) if (!web_dialog_helper_)
web_dialog_helper_.reset(new WebDialogHelper(owner_window(), web_dialog_helper_.reset(new WebDialogHelper(owner_window(),
owner_window()->IsOffScreenDummy())); owner_window()->IsOffScreenDummy()));
web_dialog_helper_->RunFileChooser(render_frame_host, params); web_dialog_helper_->RunFileChooser(render_frame_host, params);
} }

View file

@ -1360,14 +1360,14 @@ void NativeWindowViews::ShowAutofillPopup(
content::RenderFrameHost* frame_host, content::RenderFrameHost* frame_host,
const gfx::RectF& bounds, const gfx::RectF& bounds,
const std::vector<base::string16>& values, const std::vector<base::string16>& values,
const std::vector<base::string16>& labels) { const std::vector<base::string16>& labels) {
WebContentsPreferences* web_preferences = WebContentsPreferences* web_preferences =
WebContentsPreferences::FromWebContents(web_contents()); WebContentsPreferences::FromWebContents(web_contents());
bool isOffsceen = web_preferences->IsOffScreen(web_contents()); bool isOffsceen = web_preferences->IsOffScreen(web_contents());
bool isEmbedderOffscreen = web_preferences->IsGuest(web_contents()) && bool isEmbedderOffscreen = web_preferences->IsGuest(web_contents()) &&
web_preferences->IsOffScreen(web_preferences->Embedder(web_contents())); web_preferences->IsOffScreen(web_preferences->Embedder(web_contents()));
autofill_popup_->CreateView( autofill_popup_->CreateView(
frame_host, frame_host,
isOffsceen || isEmbedderOffscreen, isOffsceen || isEmbedderOffscreen,
@ -1396,7 +1396,7 @@ void NativeWindowViews::Layout() {
gfx::Rect(0, menu_bar_bounds.height(), size.width(), gfx::Rect(0, menu_bar_bounds.height(), size.width(),
size.height() - menu_bar_bounds.height())); size.height() - menu_bar_bounds.height()));
} }
if (autofill_popup_.get()) if (autofill_popup_.get())
autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight); autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
} }

View file

@ -170,7 +170,7 @@ void AutofillPopup::UpdatePopupBounds(int height_compensation) {
int desired_height = GetDesiredPopupHeight(); int desired_height = GetDesiredPopupHeight();
bool is_rtl = false; bool is_rtl = false;
gfx::Point origin(element_bounds_.origin().x(), gfx::Point origin(element_bounds_.origin().x(),
element_bounds_.origin().y() - height_compensation); element_bounds_.origin().y() - height_compensation);
gfx::Rect bounds(origin, element_bounds_.size()); gfx::Rect bounds(origin, element_bounds_.size());

View file

@ -11,8 +11,8 @@
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "ui/gfx/font_list.h" #include "ui/gfx/font_list.h"
#include "ui/native_theme/native_theme.h" #include "ui/native_theme/native_theme.h"
#include "ui/views/widget/widget.h"
#include "ui/views/view.h" #include "ui/views/view.h"
#include "ui/views/widget/widget.h"
namespace atom { namespace atom {

View file

@ -281,7 +281,7 @@ content::WebContents* WebContentsPreferences::Embedder(
} }
} }
} }
return nullptr; return nullptr;
} }