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

popContextMenu => popUpContextMenu

Browse source
This commit is contained in:
Cheng Zhao 2015-08-10 13:00:15 +08:00
parent 225140bd64
commit 33eadad139
10 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/tray_icon.cc
View file

@ -26,7 +26,7 @@ void TrayIcon::DisplayBalloon(const gfx::Image& icon,
const base::string16& contents) {
}
void TrayIcon::PopContextMenu(const gfx::Point& pos) {
void TrayIcon::PopUpContextMenu(const gfx::Point& pos) {
}
void TrayIcon::NotifyClicked(const gfx::Rect& bounds, int modifiers) {

2
atom/browser/ui/tray_icon.h
View file

@ -47,7 +47,7 @@ class TrayIcon {
const base::string16& title,
const base::string16& contents);
virtual void PopContextMenu(const gfx::Point& pos);
virtual void PopUpContextMenu(const gfx::Point& pos);
// Set the context menu for this icon.
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) = 0;

2
atom/browser/ui/tray_icon_cocoa.h
View file

@ -29,7 +29,7 @@ class TrayIconCocoa : public TrayIcon,
void SetToolTip(const std::string& tool_tip) override;
void SetTitle(const std::string& title) override;
void SetHighlightMode(bool highlight) override;
void PopContextMenu(const gfx::Point& pos) override;
void PopUpContextMenu(const gfx::Point& pos) override;
void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
protected:

6
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -230,7 +230,7 @@ const CGFloat kVerticalTitleMargin = 2;
[self setNeedsDisplay:YES];
}
- (void)popContextMenu {
- (void)popUpContextMenu {
if (menuController_ && ![menuController_ isMenuOpen]) {
// Redraw the dray icon to show highlight if it is enabled.
[self setNeedsDisplay:YES];
@ -316,8 +316,8 @@ void TrayIconCocoa::SetHighlightMode(bool highlight) {
[status_item_view_ setHighlight:highlight];
}
void TrayIconCocoa::PopContextMenu(const gfx::Point& pos) {
[status_item_view_ popContextMenu];
void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos) {
[status_item_view_ popUpContextMenu];
}
void TrayIconCocoa::SetContextMenu(ui::SimpleMenuModel* menu_model) {

4
atom/browser/ui/win/notify_icon.cc
View file

@ -87,7 +87,7 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
return;
} else if (!double_button_click) { // single right click
if (menu_model_)
PopContextMenu(cursor_pos);
PopUpContextMenu(cursor_pos);
else
NotifyRightClicked(gfx::Rect(rect), modifiers);
}
@ -163,7 +163,7 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
LOG(WARNING) << "Unable to create status tray balloon.";
}
void NotifyIcon::PopContextMenu(const gfx::Point& pos) {
void NotifyIcon::PopUpContextMenu(const gfx::Point& pos) {
// Returns if context menu isn't set.
if (!menu_model_)
return;

2
atom/browser/ui/win/notify_icon.h
View file

@ -52,7 +52,7 @@ class NotifyIcon : public TrayIcon {
void DisplayBalloon(const gfx::Image& icon,
const base::string16& title,
const base::string16& contents) override;
void PopContextMenu(const gfx::Point& pos) override;
void PopUpContextMenu(const gfx::Point& pos) override;
void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
private: