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

refactor: use C++11 class member variable initialization (#27477)

Browse source
This commit is contained in:
Milan Burda 2021-01-26 19:16:21 +01:00 • committed by GitHub
parent f083380c38
commit ddf3ef0a5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
93 changed files with 130 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/ui/gtk/app_indicator_icon.cc
View file

@ -158,7 +158,7 @@ namespace gtkui {
AppIndicatorIcon::AppIndicatorIcon(std::string id,
const gfx::ImageSkia& image,
const base::string16& tool_tip)
: id_(id), icon_(nullptr), menu_model_(nullptr), icon_change_count_(0) {
: id_(id) {
std::unique_ptr<base::Environment> env(base::Environment::Create());
desktop_env_ = base::nix::GetDesktopEnvironment(env.get());

6
shell/browser/ui/gtk/app_indicator_icon.h
View file

@ -96,13 +96,13 @@ class AppIndicatorIcon : public views::StatusIconLinux {
base::nix::DesktopEnvironment desktop_env_;
// Gtk status icon wrapper
AppIndicator* icon_;
AppIndicator* icon_ = nullptr;
std::unique_ptr<AppIndicatorIconMenu> menu_;
ui::MenuModel* menu_model_;
ui::MenuModel* menu_model_ = nullptr;
base::FilePath temp_dir_;
int icon_change_count_;
int icon_change_count_ = 0;
base::WeakPtrFactory<AppIndicatorIcon> weak_factory_{this};

5
shell/browser/ui/gtk/app_indicator_icon_menu.cc
View file

@ -16,10 +16,7 @@ namespace electron {
namespace gtkui {
AppIndicatorIconMenu::AppIndicatorIconMenu(ui::MenuModel* model)
: menu_model_(model),
click_action_replacement_menu_item_added_(false),
gtk_menu_(nullptr),
block_activation_(false) {
: menu_model_(model) {
{
ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/378770
gtk_menu_ = gtk_menu_new();

6
shell/browser/ui/gtk/app_indicator_icon_menu.h
View file

@ -54,16 +54,16 @@ class AppIndicatorIconMenu {
ui::MenuModel* menu_model_;
// Whether a "click action replacement" menu item has been added to the menu.
bool click_action_replacement_menu_item_added_;
bool click_action_replacement_menu_item_added_ = false;
// Called when the click action replacement menu item is activated. When a
// menu item from |menu_model_| is activated, MenuModel::ActivatedAt() is
// invoked and is assumed to do any necessary processing.
base::Closure click_action_replacement_callback_;
GtkWidget* gtk_menu_;
GtkWidget* gtk_menu_ = nullptr;
bool block_activation_;
bool block_activation_ = false;
DISALLOW_COPY_AND_ASSIGN(AppIndicatorIconMenu);
};