mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 91.0.4472.0 (#870763)
This commit is contained in:
@@ -23,7 +23,7 @@ class LabelButtonEx : public views::LabelButton {
|
||||
self->ButtonPressed(event);
|
||||
},
|
||||
base::Unretained(this)),
|
||||
base::string16()) {}
|
||||
std::u16string()) {}
|
||||
|
||||
virtual void ButtonPressed(const ui::Event& event) = 0;
|
||||
};
|
||||
|
@@ -31,8 +31,8 @@ void CefMenuRunnerViews::CancelContextMenu() {
|
||||
window->CancelMenu();
|
||||
}
|
||||
|
||||
bool CefMenuRunnerViews::FormatLabel(base::string16& label) {
|
||||
bool CefMenuRunnerViews::FormatLabel(std::u16string& label) {
|
||||
// Remove the accelerator indicator (&) from label strings.
|
||||
const base::string16::value_type replace[] = {L'&', 0};
|
||||
return base::ReplaceChars(label, replace, base::string16(), &label);
|
||||
const std::u16string::value_type replace[] = {L'&', 0};
|
||||
return base::ReplaceChars(label, replace, std::u16string(), &label);
|
||||
}
|
||||
|
@@ -20,7 +20,7 @@ class CefMenuRunnerViews : public CefMenuRunner {
|
||||
CefMenuModelImpl* model,
|
||||
const content::ContextMenuParams& params) override;
|
||||
void CancelContextMenu() override;
|
||||
bool FormatLabel(base::string16& label) override;
|
||||
bool FormatLabel(std::u16string& label) override;
|
||||
|
||||
private:
|
||||
CefBrowserViewImpl* browser_view_;
|
||||
|
@@ -359,7 +359,7 @@ bool CefWindowView::CanMaximize() const {
|
||||
return cef_delegate()->CanMaximize(GetCefWindow());
|
||||
}
|
||||
|
||||
base::string16 CefWindowView::GetWindowTitle() const {
|
||||
std::u16string CefWindowView::GetWindowTitle() const {
|
||||
return title_;
|
||||
}
|
||||
|
||||
@@ -471,7 +471,7 @@ display::Display CefWindowView::GetDisplay() const {
|
||||
return display::Display();
|
||||
}
|
||||
|
||||
void CefWindowView::SetTitle(const base::string16& title) {
|
||||
void CefWindowView::SetTitle(const std::u16string& title) {
|
||||
title_ = title;
|
||||
views::Widget* widget = GetWidget();
|
||||
if (widget)
|
||||
|
@@ -57,7 +57,7 @@ class CefWindowView
|
||||
bool CanResize() const override;
|
||||
bool CanMinimize() const override;
|
||||
bool CanMaximize() const override;
|
||||
base::string16 GetWindowTitle() const override;
|
||||
std::u16string GetWindowTitle() const override;
|
||||
gfx::ImageSkia GetWindowIcon() override;
|
||||
gfx::ImageSkia GetWindowAppIcon() override;
|
||||
void WindowClosing() override;
|
||||
@@ -79,8 +79,8 @@ class CefWindowView
|
||||
display::Display GetDisplay() const;
|
||||
|
||||
// Set/get the window title.
|
||||
void SetTitle(const base::string16& title);
|
||||
base::string16 title() const { return title_; }
|
||||
void SetTitle(const std::u16string& title);
|
||||
std::u16string title() const { return title_; }
|
||||
|
||||
// Set/get the window icon. This should be a 16x16 icon suitable for use in
|
||||
// the Windows's title bar.
|
||||
@@ -108,7 +108,7 @@ class CefWindowView
|
||||
// True if the window is frameless. It might still be resizable and draggable.
|
||||
bool is_frameless_;
|
||||
|
||||
base::string16 title_;
|
||||
std::u16string title_;
|
||||
CefRefPtr<CefImage> window_icon_;
|
||||
CefRefPtr<CefImage> window_app_icon_;
|
||||
|
||||
|
Reference in New Issue
Block a user