projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
views
/
controls
/
menu
/
menu_runner_cocoa_unittest.mm
diff --git
a/src/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
b/src/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
index
b43c6e8
..
bfd5723
100644
(file)
--- a/
src/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
+++ b/
src/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
@@
-17,7
+17,7
@@
class MenuRunnerCocoaTest : public ViewsTestBase {
MenuRunnerCocoaTest() : runner_(NULL) {}
virtual ~MenuRunnerCocoaTest() {}
MenuRunnerCocoaTest() : runner_(NULL) {}
virtual ~MenuRunnerCocoaTest() {}
- virtual void SetUp()
OVERRIDE
{
+ virtual void SetUp()
override
{
ViewsTestBase::SetUp();
menu_.reset(new ui::SimpleMenuModel(NULL));
ViewsTestBase::SetUp();
menu_.reset(new ui::SimpleMenuModel(NULL));
@@
-27,7
+27,7
@@
class MenuRunnerCocoaTest : public ViewsTestBase {
EXPECT_FALSE(runner_->IsRunning());
}
EXPECT_FALSE(runner_->IsRunning());
}
- virtual void TearDown()
OVERRIDE
{
+ virtual void TearDown()
override
{
if (runner_) {
runner_->Release();
runner_ = NULL;
if (runner_) {
runner_->Release();
runner_ = NULL;