mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 89.0.4389.0 (#843830)
- SSE3 is now required on x86 processors (see https://crbug.com/1123353).
This commit is contained in:
@ -1,26 +1,27 @@
|
||||
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.cc chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
index 1ddf613c138f..00c497b67533 100644
|
||||
index 0b22a38aefb2..c7be7da822f6 100644
|
||||
--- chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
+++ chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
@@ -21,8 +21,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
|
||||
content::WebContents* web_contents,
|
||||
@@ -19,8 +19,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
|
||||
gfx::NativeWindow native_window,
|
||||
SharesheetService* sharesheet_service)
|
||||
: id_(id),
|
||||
: native_window_(native_window),
|
||||
+#if defined(OS_CHROMEOS)
|
||||
sharesheet_bubble_view_(
|
||||
std::make_unique<SharesheetBubbleView>(web_contents, this)),
|
||||
std::make_unique<SharesheetBubbleView>(native_window, this)),
|
||||
+#endif
|
||||
sharesheet_service_(sharesheet_service) {}
|
||||
|
||||
SharesheetServiceDelegate::~SharesheetServiceDelegate() = default;
|
||||
@@ -31,18 +33,24 @@ void SharesheetServiceDelegate::ShowBubble(
|
||||
std::vector<TargetInfo> targets,
|
||||
apps::mojom::IntentPtr intent,
|
||||
sharesheet::CloseCallback close_callback) {
|
||||
@@ -36,21 +38,27 @@ void SharesheetServiceDelegate::ShowBubble(
|
||||
}
|
||||
return;
|
||||
}
|
||||
+#if defined(OS_CHROMEOS)
|
||||
sharesheet_bubble_view_->ShowBubble(std::move(targets), std::move(intent),
|
||||
std::move(close_callback));
|
||||
+#endif
|
||||
is_bubble_open_ = true;
|
||||
}
|
||||
|
||||
void SharesheetServiceDelegate::OnBubbleClosed(
|
||||
@ -28,7 +29,9 @@ index 1ddf613c138f..00c497b67533 100644
|
||||
+#if defined(OS_CHROMEOS)
|
||||
sharesheet_bubble_view_.release();
|
||||
+#endif
|
||||
sharesheet_service_->OnBubbleClosed(id_, active_action);
|
||||
sharesheet_service_->OnBubbleClosed(native_window_, active_action);
|
||||
// This object is now deleted and nothing can be accessed any more.
|
||||
// Therefore there is no need to set is_bubble_open_ to false.
|
||||
}
|
||||
|
||||
void SharesheetServiceDelegate::OnActionLaunched() {
|
||||
@ -38,7 +41,7 @@ index 1ddf613c138f..00c497b67533 100644
|
||||
}
|
||||
|
||||
void SharesheetServiceDelegate::OnTargetSelected(
|
||||
@@ -66,11 +74,15 @@ void SharesheetServiceDelegate::SetSharesheetSize(const int& width,
|
||||
@@ -74,11 +82,15 @@ void SharesheetServiceDelegate::SetSharesheetSize(const int& width,
|
||||
const int& height) {
|
||||
DCHECK_GT(width, 0);
|
||||
DCHECK_GT(height, 0);
|
||||
@ -55,12 +58,12 @@ index 1ddf613c138f..00c497b67533 100644
|
||||
|
||||
const gfx::VectorIcon* SharesheetServiceDelegate::GetVectorIcon(
|
||||
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.h chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
index e957b2c39772..80d9dc7b6c76 100644
|
||||
index 164a3a35a3f5..82b8c15820c9 100644
|
||||
--- chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
+++ chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
@@ -64,7 +64,9 @@ class SharesheetServiceDelegate : public SharesheetController {
|
||||
private:
|
||||
const uint32_t id_;
|
||||
@@ -65,7 +65,9 @@ class SharesheetServiceDelegate : public SharesheetController {
|
||||
gfx::NativeWindow native_window_;
|
||||
|
||||
base::string16 active_action_;
|
||||
+#if defined(OS_CHROMEOS)
|
||||
std::unique_ptr<SharesheetBubbleView> sharesheet_bubble_view_;
|
||||
|
Reference in New Issue
Block a user