chore: bump chromium to f755b70e34659441e72c1a928a406 (master) (#21000)
This commit is contained in:
parent
a5c9bd53e0
commit
49b47ee4ed
181 changed files with 1117 additions and 1786 deletions
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "base/memory/ref_counted_memory.h"
|
||||
#include "base/strings/string_util.h"
|
||||
|
@ -62,7 +63,7 @@ class BundledDataSource : public content::URLDataSource {
|
|||
|
||||
void StartDataRequest(const GURL& url,
|
||||
const content::WebContents::Getter& wc_getter,
|
||||
const GotDataCallback& callback) override {
|
||||
GotDataCallback callback) override {
|
||||
const std::string path = content::URLDataSource::URLToRequestPath(url);
|
||||
// Serve request from local bundle.
|
||||
std::string bundled_path_prefix(kChromeUIDevToolsBundledPath);
|
||||
|
@ -70,12 +71,12 @@ class BundledDataSource : public content::URLDataSource {
|
|||
if (base::StartsWith(path, bundled_path_prefix,
|
||||
base::CompareCase::INSENSITIVE_ASCII)) {
|
||||
StartBundledDataRequest(path.substr(bundled_path_prefix.length()),
|
||||
callback);
|
||||
std::move(callback));
|
||||
return;
|
||||
}
|
||||
|
||||
// We do not handle remote and custom requests.
|
||||
callback.Run(nullptr);
|
||||
std::move(callback).Run(nullptr);
|
||||
}
|
||||
|
||||
std::string GetMimeType(const std::string& path) override {
|
||||
|
@ -89,18 +90,16 @@ class BundledDataSource : public content::URLDataSource {
|
|||
bool ShouldServeMimeTypeAsContentTypeHeader() override { return true; }
|
||||
|
||||
void StartBundledDataRequest(const std::string& path,
|
||||
const GotDataCallback& callback) {
|
||||
GotDataCallback callback) {
|
||||
std::string filename = PathWithoutParams(path);
|
||||
base::StringPiece resource =
|
||||
content::DevToolsFrontendHost::GetFrontendResource(filename);
|
||||
scoped_refptr<base::RefCountedMemory> bytes =
|
||||
content::DevToolsFrontendHost::GetFrontendResourceBytes(filename);
|
||||
|
||||
DLOG_IF(WARNING, resource.empty())
|
||||
DLOG_IF(WARNING, !bytes)
|
||||
<< "Unable to find dev tool resource: " << filename
|
||||
<< ". If you compiled with debug_devtools=1, try running with "
|
||||
"--debug-devtools.";
|
||||
scoped_refptr<base::RefCountedStaticMemory> bytes(
|
||||
new base::RefCountedStaticMemory(resource.data(), resource.length()));
|
||||
callback.Run(bytes.get());
|
||||
std::move(callback).Run(bytes);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
@ -166,9 +166,8 @@ bool MenuBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
|||
electron::KeyboardCodeFromCharCode(button->accelerator(), &shifted);
|
||||
|
||||
if (keycode == accelerator.key_code()) {
|
||||
const gfx::Point p(0, 0);
|
||||
auto event = accelerator.ToKeyEvent();
|
||||
OnMenuButtonClicked(button, p, &event);
|
||||
ButtonPressed(button, event);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -255,9 +254,7 @@ const char* MenuBar::GetClassName() const {
|
|||
return kViewClassName;
|
||||
}
|
||||
|
||||
void MenuBar::OnMenuButtonClicked(views::Button* source,
|
||||
const gfx::Point& point,
|
||||
const ui::Event* event) {
|
||||
void MenuBar::ButtonPressed(views::Button* source, const ui::Event& event) {
|
||||
// Hide the accelerator when a submenu is activated.
|
||||
SetAcceleratorVisibility(false);
|
||||
|
||||
|
@ -276,10 +273,9 @@ void MenuBar::OnMenuButtonClicked(views::Button* source,
|
|||
|
||||
// Deleted in MenuDelegate::OnMenuClosed
|
||||
MenuDelegate* menu_delegate = new MenuDelegate(this);
|
||||
menu_delegate->RunMenu(menu_model_->GetSubmenuModelAt(id), source,
|
||||
event != nullptr && event->IsKeyEvent()
|
||||
? ui::MENU_SOURCE_KEYBOARD
|
||||
: ui::MENU_SOURCE_MOUSE);
|
||||
menu_delegate->RunMenu(
|
||||
menu_model_->GetSubmenuModelAt(id), source,
|
||||
event.IsKeyEvent() ? ui::MENU_SOURCE_KEYBOARD : ui::MENU_SOURCE_MOUSE);
|
||||
menu_delegate->AddObserver(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "shell/browser/ui/views/menu_delegate.h"
|
||||
#include "shell/browser/ui/views/root_view.h"
|
||||
#include "ui/views/accessible_pane_view.h"
|
||||
#include "ui/views/controls/button/menu_button_listener.h"
|
||||
#include "ui/views/controls/button/button.h"
|
||||
#include "ui/views/focus/focus_manager.h"
|
||||
#include "ui/views/view.h"
|
||||
|
||||
|
@ -37,7 +37,7 @@ class MenuBarColorUpdater : public views::FocusChangeListener {
|
|||
};
|
||||
|
||||
class MenuBar : public views::AccessiblePaneView,
|
||||
public views::MenuButtonListener,
|
||||
public views::ButtonListener,
|
||||
public electron::MenuDelegate::Observer {
|
||||
public:
|
||||
static const char kViewClassName[];
|
||||
|
@ -78,10 +78,8 @@ class MenuBar : public views::AccessiblePaneView,
|
|||
// views::View:
|
||||
const char* GetClassName() const override;
|
||||
|
||||
// views::MenuButtonListener:
|
||||
void OnMenuButtonClicked(views::Button* source,
|
||||
const gfx::Point& point,
|
||||
const ui::Event* event) override;
|
||||
// views::ButtonListener:
|
||||
void ButtonPressed(views::Button* source, const ui::Event& event) override;
|
||||
void OnThemeChanged() override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
namespace electron {
|
||||
|
||||
SubmenuButton::SubmenuButton(const base::string16& title,
|
||||
views::MenuButtonListener* menu_button_listener,
|
||||
views::ButtonListener* button_listener,
|
||||
const SkColor& background_color)
|
||||
: views::MenuButton(
|
||||
gfx::RemoveAcceleratorChar(title, '&', nullptr, nullptr),
|
||||
menu_button_listener),
|
||||
button_listener),
|
||||
background_color_(background_color) {
|
||||
#if defined(OS_LINUX)
|
||||
// Dont' use native style border.
|
||||
|
|
|
@ -17,7 +17,7 @@ namespace electron {
|
|||
class SubmenuButton : public views::MenuButton {
|
||||
public:
|
||||
SubmenuButton(const base::string16& title,
|
||||
views::MenuButtonListener* menu_button_listener,
|
||||
views::ButtonListener* button_listener,
|
||||
const SkColor& background_color);
|
||||
~SubmenuButton() override;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue