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

[Win] Remove the extra MenuWrapper class.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-19 16:30:25 +08:00
parent 738a929f8c
commit dde07f03ec
6 changed files with 36 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom.gyp
View file

@ -110,7 +110,6 @@
'browser/ui/nsalert_synchronous_sheet_mac.mm',
'browser/ui/win/menu_2.cc',
'browser/ui/win/menu_2.h',
'browser/ui/win/menu_wrapper.h',
'browser/ui/win/native_menu_win.cc',
'browser/ui/win/native_menu_win.h',
'browser/window_list.cc',

7
browser/ui/win/menu_2.cc
View file

@ -13,9 +13,10 @@ using namespace views; // NOLINT
namespace atom {
Menu2::Menu2(ui::MenuModel* model)
Menu2::Menu2(ui::MenuModel* model, bool as_window_menu)
: model_(model),
wrapper_(MenuWrapper::CreateWrapper(model)) {
wrapper_(new NativeMenuWin(model, NULL)) {
wrapper_->set_create_as_window_menu(as_window_menu);
Rebuild();
}
@ -45,7 +46,7 @@ void Menu2::UpdateStates() {
wrapper_->UpdateStates();
}
MenuWrapper::MenuAction Menu2::GetMenuAction() const {
NativeMenuWin::MenuAction Menu2::GetMenuAction() const {
return wrapper_->GetMenuAction();
}

8
browser/ui/win/menu_2.h
View file

@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "browser/ui/win/menu_wrapper.h"
#include "browser/ui/win/native_menu_win.h"
#include "ui/gfx/native_widget_types.h"
namespace gfx {
@ -41,7 +41,7 @@ class Menu2 {
// from the constructor. EG:
// MyClass : menu_(this) {}
// is likely to have problems.
explicit Menu2(ui::MenuModel* model);
explicit Menu2(ui::MenuModel* model, bool as_window_menu = false);
virtual ~Menu2();
// Runs the menu at the specified point. This method blocks until done.
@ -67,7 +67,7 @@ class Menu2 {
// Get the result of the last call to RunMenuAt to determine whether an
// item was selected, the user navigated to a next or previous menu, or
// nothing.
MenuWrapper::MenuAction GetMenuAction() const;
NativeMenuWin::MenuAction GetMenuAction() const;
// Add a listener to receive a callback when the menu opens.
void AddMenuListener(views::MenuListener* listener);
@ -85,7 +85,7 @@ class Menu2 {
ui::MenuModel* model_;
// The object that actually implements the menu.
scoped_ptr<MenuWrapper> wrapper_;
scoped_ptr<NativeMenuWin> wrapper_;
DISALLOW_COPY_AND_ASSIGN(Menu2);
};

76
browser/ui/win/menu_wrapper.h
View file

@ -1,76 +0,0 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef BROWSER_UI_WIN_MENU_WRAPPER_H_
#define BROWSER_UI_WIN_MENU_WRAPPER_H_
#include "ui/gfx/native_widget_types.h"
namespace gfx {
class Point;
}
namespace ui {
class MenuModel;
}
namespace views {
class MenuInsertionDelegateWin;
class MenuListener;
}
namespace atom {
// An interface that wraps an object that implements a menu.
class MenuWrapper {
public:
// All of the possible actions that can result from RunMenuAt.
enum MenuAction {
MENU_ACTION_NONE, // Menu cancelled, or never opened.
MENU_ACTION_SELECTED, // An item was selected.
MENU_ACTION_PREVIOUS, // User wants to navigate to the previous menu.
MENU_ACTION_NEXT, // User wants to navigate to the next menu.
};
virtual ~MenuWrapper() {}
// Creates the appropriate instance of this wrapper for the current platform.
static MenuWrapper* CreateWrapper(ui::MenuModel* model);
// Runs the menu at the specified point. This blocks until done.
virtual void RunMenuAt(const gfx::Point& point, int alignment) = 0;
// Cancels the active menu.
virtual void CancelMenu() = 0;
// Called when the model supplying data to this menu has changed, and the menu
// must be rebuilt.
virtual void Rebuild(views::MenuInsertionDelegateWin* delegate) = 0;
// Called when the states of the items in the menu must be updated from the
// model.
virtual void UpdateStates() = 0;
// Retrieve a native menu handle.
virtual HMENU GetNativeMenu() const = 0;
// Get the result of the last call to RunMenuAt to determine whether an
// item was selected, the user navigated to a next or previous menu, or
// nothing.
virtual MenuAction GetMenuAction() const = 0;
// Add a listener to receive a callback when the menu opens.
virtual void AddMenuListener(views::MenuListener* listener) = 0;
// Remove a menu listener.
virtual void RemoveMenuListener(views::MenuListener* listener) = 0;
// Sets the minimum width of the menu.
virtual void SetMinimumWidth(int width) = 0;
};
} // namespace atom
#endif // BROWSER_UI_WIN_MENU_WRAPPER_H_

10
browser/ui/win/native_menu_win.cc
View file

@ -156,7 +156,7 @@ class NativeMenuWin::MenuHostWindow {
// Only notify the model if it didn't already send out notification.
// See comment in MenuMessageHook for details.
if (root_menu->menu_action_ == MenuWrapper::MENU_ACTION_NONE)
if (root_menu->menu_action_ == MENU_ACTION_NONE)
model->ActivatedAt(position);
}
@ -758,12 +758,4 @@ void NativeMenuWin::CreateHostWindow() {
host_window_.reset(new MenuHostWindow(this));
}
////////////////////////////////////////////////////////////////////////////////
// MenuWrapper, public:
// static
MenuWrapper* MenuWrapper::CreateWrapper(ui::MenuModel* model) {
return new NativeMenuWin(model, NULL);
}
} // namespace atom

41
browser/ui/win/native_menu_win.h
View file

@ -14,34 +14,47 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/string16.h"
#include "browser/ui/win/menu_wrapper.h"
namespace gfx {
class Point;
}
namespace ui {
class MenuModel;
}
namespace views {
class MenuInsertionDelegateWin;
class MenuListener;
}
namespace atom {
// A Windows implementation of MenuWrapper.
// TODO(beng): rename to MenuWin once the old class is dead.
class NativeMenuWin : public MenuWrapper {
class NativeMenuWin {
public:
// All of the possible actions that can result from RunMenuAt.
enum MenuAction {
MENU_ACTION_NONE, // Menu cancelled, or never opened.
MENU_ACTION_SELECTED, // An item was selected.
MENU_ACTION_PREVIOUS, // User wants to navigate to the previous menu.
MENU_ACTION_NEXT, // User wants to navigate to the next menu.
};
// Construct a NativeMenuWin, with a model and delegate. If |system_menu_for|
// is non-NULL, the NativeMenuWin wraps the system menu for that window.
// The caller owns the model and the delegate.
NativeMenuWin(ui::MenuModel* model, HWND system_menu_for);
virtual ~NativeMenuWin();
// Overridden from MenuWrapper:
virtual void RunMenuAt(const gfx::Point& point, int alignment) OVERRIDE;
virtual void CancelMenu() OVERRIDE;
virtual void Rebuild(views::MenuInsertionDelegateWin* delegate) OVERRIDE;
virtual void UpdateStates() OVERRIDE;
virtual HMENU GetNativeMenu() const OVERRIDE;
virtual MenuAction GetMenuAction() const OVERRIDE;
virtual void AddMenuListener(views::MenuListener* listener) OVERRIDE;
virtual void RemoveMenuListener(views::MenuListener* listener) OVERRIDE;
virtual void SetMinimumWidth(int width) OVERRIDE;
void RunMenuAt(const gfx::Point& point, int alignment);
void CancelMenu() ;
void Rebuild(views::MenuInsertionDelegateWin* delegate) ;
void UpdateStates() ;
HMENU GetNativeMenu() const ;
MenuAction GetMenuAction() const ;
void AddMenuListener(views::MenuListener* listener) ;
void RemoveMenuListener(views::MenuListener* listener) ;
void SetMinimumWidth(int width) ;
// Flag to create a window menu instead of popup menu.
void set_create_as_window_menu(bool flag) { create_as_window_menu_ = flag; }