| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index e0896b097faf8f623e0ab52116a4fa38167c3103..c93648f644f4bed1477f77230eba11128c5eb818 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -168,6 +168,7 @@
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| +#include "base/win/windows_version.h"
|
| #include "chrome/browser/win/jumplist.h"
|
| #include "ui/gfx/color_palette.h"
|
| #include "ui/native_theme/native_theme_dark_win.h"
|
| @@ -550,7 +551,7 @@ void BrowserView::Paint1pxHorizontalLine(gfx::Canvas* canvas,
|
| }
|
|
|
| void BrowserView::InitStatusBubble() {
|
| - status_bubble_.reset(new StatusBubbleViews(contents_web_view_));
|
| + status_bubble_.reset(new StatusBubbleViews(this, contents_web_view_));
|
| contents_web_view_->SetStatusBubble(status_bubble_.get());
|
| }
|
|
|
| @@ -614,6 +615,15 @@ bool BrowserView::IsRegularOrGuestSession() const {
|
| return profiles::IsRegularOrGuestSession(browser_.get());
|
| }
|
|
|
| +bool BrowserView::HasClientEdge() const {
|
| +#if defined(OS_WIN)
|
| + return base::win::GetVersion() < base::win::VERSION_WIN10 ||
|
| + !frame_->ShouldUseNativeFrame();
|
| +#else
|
| + return true;
|
| +#endif
|
| +}
|
| +
|
| bool BrowserView::GetAccelerator(int cmd_id,
|
| ui::Accelerator* accelerator) const {
|
| // We retrieve the accelerator information for standard accelerators
|
|
|