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
/
chrome
/
browser
/
ui
/
views
/
status_icons
/
status_tray_state_changer_interactive_uitest_win.cc
diff --git
a/src/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
b/src/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
index
211023a
..
9093a00
100644
(file)
--- a/
src/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
+++ b/
src/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
@@
-18,7
+18,7
@@
class StatusTrayStateChangerWinTest : public testing::Test {
public:
StatusTrayStateChangerWinTest() {}
public:
StatusTrayStateChangerWinTest() {}
- void SetUp()
OVERRIDE
{
+ void SetUp()
override
{
testing::Test::SetUp();
com_.reset(new base::win::ScopedCOMInitializer());
status_tray_.reset(new StatusTrayWin());
testing::Test::SetUp();
com_.reset(new base::win::ScopedCOMInitializer());
status_tray_.reset(new StatusTrayWin());
@@
-35,7
+35,7
@@
class StatusTrayStateChangerWinTest : public testing::Test {
status_icon_win_->window());
}
status_icon_win_->window());
}
- void TearDown()
OVERRIDE
{
+ void TearDown()
override
{
tray_watcher_ = NULL;
status_tray_.reset();
com_.reset();
tray_watcher_ = NULL;
status_tray_.reset();
com_.reset();