mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: rename atom -> electron (#21986)

Browse source
This commit is contained in:
Jeremy Apthorp 2020-02-04 12:19:40 -08:00 • committed by GitHub
parent f14fc4b041
commit d9321f4df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
287 changed files with 1771 additions and 1708 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/ui/views/atom_views_delegate.cc → shell/browser/ui/views/electron_views_delegate.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#include "shell/browser/ui/views/atom_views_delegate.h"
#include "shell/browser/ui/views/electron_views_delegate.h"
#include <memory>

6
shell/browser/ui/views/atom_views_delegate.h → shell/browser/ui/views/electron_views_delegate.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#ifndef SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
#define SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
#ifndef SHELL_BROWSER_UI_VIEWS_ELECTRON_VIEWS_DELEGATE_H_
#define SHELL_BROWSER_UI_VIEWS_ELECTRON_VIEWS_DELEGATE_H_
#include <map>
#include <string>
@ -76,4 +76,4 @@ class ViewsDelegate : public views::ViewsDelegate {
} // namespace electron
#endif // SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
#endif // SHELL_BROWSER_UI_VIEWS_ELECTRON_VIEWS_DELEGATE_H_

2
shell/browser/ui/views/atom_views_delegate_win.cc → shell/browser/ui/views/electron_views_delegate_win.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#include "shell/browser/ui/views/atom_views_delegate.h"
#include "shell/browser/ui/views/electron_views_delegate.h"
#include <dwmapi.h>
#include <shellapi.h>

33
shell/browser/ui/views/global_menu_bar_x11.cc
View file

@ -12,7 +12,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
#include "shell/browser/native_window_views.h"
#include "shell/browser/ui/atom_menu_model.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
@ -134,8 +134,8 @@ void EnsureMethodsLoaded() {
dlsym(dbusmenu_lib, "dbusmenu_server_set_root"));
}
AtomMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
return reinterpret_cast<AtomMenuModel*>(
ElectronMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
return reinterpret_cast<ElectronMenuModel*>(
g_object_get_data(G_OBJECT(item), "model"));
}
@ -156,7 +156,7 @@ void SetMenuItemID(DbusmenuMenuitem* item, int id) {
g_object_set_data(G_OBJECT(item), "menu-id", GINT_TO_POINTER(id + 1));
}
std::string GetMenuModelStatus(AtomMenuModel* model) {
std::string GetMenuModelStatus(ElectronMenuModel* model) {
std::string ret;
for (int i = 0; i < model->GetItemCount(); ++i) {
int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
@ -192,7 +192,7 @@ std::string GlobalMenuBarX11::GetPathForWindow(gfx::AcceleratedWidget xid) {
return base::StringPrintf("/com/canonical/menu/%lX", xid);
}
void GlobalMenuBarX11::SetMenu(AtomMenuModel* menu_model) {
void GlobalMenuBarX11::SetMenu(ElectronMenuModel* menu_model) {
if (!IsServerStarted())
return;
@ -224,14 +224,14 @@ void GlobalMenuBarX11::OnWindowUnmapped() {
GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xid_);
}
void GlobalMenuBarX11::BuildMenuFromModel(AtomMenuModel* model,
void GlobalMenuBarX11::BuildMenuFromModel(ElectronMenuModel* model,
DbusmenuMenuitem* parent) {
for (int i = 0; i < model->GetItemCount(); ++i) {
DbusmenuMenuitem* item = menuitem_new();
menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
AtomMenuModel::ItemType type = model->GetTypeAt(i);
if (type == AtomMenuModel::TYPE_SEPARATOR) {
ElectronMenuModel::ItemType type = model->GetTypeAt(i);
if (type == ElectronMenuModel::TYPE_SEPARATOR) {
menuitem_property_set(item, kPropertyType, kTypeSeparator);
} else {
std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
@ -242,7 +242,7 @@ void GlobalMenuBarX11::BuildMenuFromModel(AtomMenuModel* model,
g_object_set_data(G_OBJECT(item), "model", model);
SetMenuItemID(item, i);
if (type == AtomMenuModel::TYPE_SUBMENU) {
if (type == ElectronMenuModel::TYPE_SUBMENU) {
menuitem_property_set(item, kPropertyChildrenDisplay, kDisplaySubmenu);
g_signal_connect(item, "about-to-show", G_CALLBACK(OnSubMenuShowThunk),
this);
@ -254,11 +254,12 @@ void GlobalMenuBarX11::BuildMenuFromModel(AtomMenuModel* model,
g_signal_connect(item, "item-activated",
G_CALLBACK(OnItemActivatedThunk), this);
if (type == AtomMenuModel::TYPE_CHECK ||
type == AtomMenuModel::TYPE_RADIO) {
menuitem_property_set(
item, kPropertyToggleType,
type == AtomMenuModel::TYPE_CHECK ? kToggleCheck : kToggleRadio);
if (type == ElectronMenuModel::TYPE_CHECK ||
type == ElectronMenuModel::TYPE_RADIO) {
menuitem_property_set(item, kPropertyToggleType,
type == ElectronMenuModel::TYPE_CHECK
? kToggleCheck
: kToggleRadio);
menuitem_property_set_int(item, kPropertyToggleState,
model->IsItemCheckedAt(i));
}
@ -303,14 +304,14 @@ void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
unsigned int timestamp) {
int id;
AtomMenuModel* model = ModelForMenuItem(item);
ElectronMenuModel* model = ModelForMenuItem(item);
if (model && GetMenuItemID(item, &id))
model->ActivatedAt(id, 0);
}
void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
int id;
AtomMenuModel* model = ModelForMenuItem(item);
ElectronMenuModel* model = ModelForMenuItem(item);
if (!model || !GetMenuItemID(item, &id))
return;

6
shell/browser/ui/views/global_menu_bar_x11.h
View file

@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "shell/browser/ui/atom_menu_model.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "ui/base/glib/glib_signal.h"
#include "ui/gfx/native_widget_types.h"
@ -43,7 +43,7 @@ class GlobalMenuBarX11 {
// Creates the object path for DbusmenuServer which is attached to |xid|.
static std::string GetPathForWindow(gfx::AcceleratedWidget xid);
void SetMenu(AtomMenuModel* menu_model);
void SetMenu(ElectronMenuModel* menu_model);
bool IsServerStarted() const;
// Called by NativeWindow when it show/hides.
@ -55,7 +55,7 @@ class GlobalMenuBarX11 {
void InitServer(gfx::AcceleratedWidget xid);
// Create a menu from menu model.
void BuildMenuFromModel(AtomMenuModel* model, DbusmenuMenuitem* parent);
void BuildMenuFromModel(ElectronMenuModel* model, DbusmenuMenuitem* parent);
// Sets the accelerator for |item|.
void RegisterAccelerator(DbusmenuMenuitem* item,

10
shell/browser/ui/views/menu_bar.cc
View file

@ -68,7 +68,7 @@ MenuBar::~MenuBar() {
window_->GetFocusManager()->RemoveFocusChangeListener(color_updater_.get());
}
void MenuBar::SetMenu(AtomMenuModel* model) {
void MenuBar::SetMenu(ElectronMenuModel* model) {
menu_model_ = model;
RebuildChildren();
}
@ -101,7 +101,7 @@ int MenuBar::GetItemCount() const {
}
bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
AtomMenuModel** menu_model,
ElectronMenuModel** menu_model,
views::MenuButton** button) {
if (!GetBoundsInScreen().Contains(screenPoint))
return false;
@ -109,7 +109,7 @@ bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
auto children = GetChildrenInZOrder();
for (int i = 0, n = children.size(); i < n; ++i) {
if (children[i]->GetBoundsInScreen().Contains(screenPoint) &&
(menu_model_->GetTypeAt(i) == AtomMenuModel::TYPE_SUBMENU)) {
(menu_model_->GetTypeAt(i) == ElectronMenuModel::TYPE_SUBMENU)) {
*menu_model = menu_model_->GetSubmenuModelAt(i);
*button = static_cast<views::MenuButton*>(children[i]);
return true;
@ -265,8 +265,8 @@ void MenuBar::ButtonPressed(views::Button* source, const ui::Event& event) {
window_->RequestFocus();
int id = source->tag();
AtomMenuModel::ItemType type = menu_model_->GetTypeAt(id);
if (type != AtomMenuModel::TYPE_SUBMENU) {
ElectronMenuModel::ItemType type = menu_model_->GetTypeAt(id);
if (type != ElectronMenuModel::TYPE_SUBMENU) {
menu_model_->ActivatedAt(id, 0);
return;
}

8
shell/browser/ui/views/menu_bar.h
View file

@ -7,7 +7,7 @@
#include <memory>
#include "shell/browser/ui/atom_menu_model.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "shell/browser/ui/views/menu_delegate.h"
#include "shell/browser/ui/views/root_view.h"
#include "ui/views/accessible_pane_view.h"
@ -46,7 +46,7 @@ class MenuBar : public views::AccessiblePaneView,
~MenuBar() override;
// Replaces current menu with a new one.
void SetMenu(AtomMenuModel* menu_model);
void SetMenu(ElectronMenuModel* menu_model);
// Shows underline under accelerators.
void SetAcceleratorVisibility(bool visible);
@ -62,7 +62,7 @@ class MenuBar : public views::AccessiblePaneView,
// Get the menu under specified screen point.
bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
AtomMenuModel** menu_model,
ElectronMenuModel** menu_model,
views::MenuButton** button);
// electron::MenuDelegate::Observer:
@ -96,7 +96,7 @@ class MenuBar : public views::AccessiblePaneView,
#endif
RootView* window_ = nullptr;
AtomMenuModel* menu_model_ = nullptr;
ElectronMenuModel* menu_model_ = nullptr;
View* FindAccelChild(base::char16 key);

4
shell/browser/ui/views/menu_delegate.cc
View file

@ -23,7 +23,7 @@ MenuDelegate::MenuDelegate(MenuBar* menu_bar)
MenuDelegate::~MenuDelegate() = default;
void MenuDelegate::RunMenu(AtomMenuModel* model,
void MenuDelegate::RunMenu(ElectronMenuModel* model,
views::Button* button,
ui::MenuSourceType source_type) {
gfx::Point screen_loc;
@ -123,7 +123,7 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
// TODO(zcbenz): We should follow Chromium's logics on implementing the
// sibling menu switches, this code is almost a hack.
views::MenuButton* button;
AtomMenuModel* model;
ElectronMenuModel* model;
if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
button->tag() != id_) {
bool switch_in_progress = !!button_to_open_;

4
shell/browser/ui/views/menu_delegate.h
View file

@ -8,7 +8,7 @@
#include <memory>
#include "base/observer_list.h"
#include "shell/browser/ui/atom_menu_model.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "ui/views/controls/menu/menu_delegate.h"
namespace views {
@ -25,7 +25,7 @@ class MenuDelegate : public views::MenuDelegate {
explicit MenuDelegate(MenuBar* menu_bar);
~MenuDelegate() override;
void RunMenu(AtomMenuModel* model,
void RunMenu(ElectronMenuModel* model,
views::Button* button,
ui::MenuSourceType source_type);

4
shell/browser/ui/views/menu_model_adapter.cc
View file

@ -6,7 +6,7 @@
namespace electron {
MenuModelAdapter::MenuModelAdapter(AtomMenuModel* menu_model)
MenuModelAdapter::MenuModelAdapter(ElectronMenuModel* menu_model)
: views::MenuModelAdapter(menu_model), menu_model_(menu_model) {}
MenuModelAdapter::~MenuModelAdapter() = default;
@ -16,7 +16,7 @@ bool MenuModelAdapter::GetAccelerator(int id,
ui::MenuModel* model = menu_model_;
int index = 0;
if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
return static_cast<AtomMenuModel*>(model)->GetAcceleratorAtWithParams(
return static_cast<ElectronMenuModel*>(model)->GetAcceleratorAtWithParams(
index, true, accelerator);
}
return false;

6
shell/browser/ui/views/menu_model_adapter.h
View file

@ -5,21 +5,21 @@
#ifndef SHELL_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
#define SHELL_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
#include "shell/browser/ui/atom_menu_model.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
namespace electron {
class MenuModelAdapter : public views::MenuModelAdapter {
public:
explicit MenuModelAdapter(AtomMenuModel* menu_model);
explicit MenuModelAdapter(ElectronMenuModel* menu_model);
~MenuModelAdapter() override;
protected:
bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
private:
AtomMenuModel* menu_model_;
ElectronMenuModel* menu_model_;
DISALLOW_COPY_AND_ASSIGN(MenuModelAdapter);
};

2
shell/browser/ui/views/native_frame_view.cc
View file

@ -8,7 +8,7 @@
namespace electron {
const char NativeFrameView::kViewClassName[] = "AtomNativeFrameView";
const char NativeFrameView::kViewClassName[] = "ElectronNativeFrameView";
NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget)
: views::NativeFrameView(widget), window_(window) {}

5
shell/browser/ui/views/root_view.cc
View file

@ -45,7 +45,7 @@ RootView::RootView(NativeWindow* window)
RootView::~RootView() = default;
void RootView::SetMenu(AtomMenuModel* menu_model) {
void RootView::SetMenu(ElectronMenuModel* menu_model) {
if (menu_model == nullptr) {
// Remove accelerators
UnregisterAcceleratorsWithFocusManager();
@ -201,7 +201,8 @@ bool RootView::AcceleratorPressed(const ui::Accelerator& accelerator) {
accelerator);
}
void RootView::RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model) {
void RootView::RegisterAcceleratorsWithFocusManager(
ElectronMenuModel* menu_model) {
if (!menu_model)
return;
// Clear previous accelerators.

6
shell/browser/ui/views/root_view.h
View file

@ -18,7 +18,7 @@ struct NativeWebKeyboardEvent;
namespace electron {
class AtomMenuModel;
class ElectronMenuModel;
class MenuBar;
class NativeWindow;
@ -27,7 +27,7 @@ class RootView : public views::View {
explicit RootView(NativeWindow* window);
~RootView() override;
void SetMenu(AtomMenuModel* menu_model);
void SetMenu(ElectronMenuModel* menu_model);
bool HasMenu() const;
int GetMenuBarHeight() const;
void SetAutoHideMenuBar(bool auto_hide);
@ -38,7 +38,7 @@ class RootView : public views::View {
void ResetAltState();
void RestoreFocus();
// Register/Unregister accelerators supported by the menu model.
void RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model);
void RegisterAcceleratorsWithFocusManager(ElectronMenuModel* menu_model);
void UnregisterAcceleratorsWithFocusManager();
// views::View: