Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2344)

Side by Side Diff: chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" 5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
11 #include "chrome/common/mac/app_shim_messages.h" 11 #include "chrome/common/mac/app_shim_messages.h"
12 #include "ipc/ipc_message.h" 12 #include "ipc/ipc_message.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace { 15 namespace {
16 16
17 class TestingAppShimHost : public AppShimHost { 17 class TestingAppShimHost : public AppShimHost {
18 public: 18 public:
19 TestingAppShimHost() {} 19 TestingAppShimHost() {}
20 virtual ~TestingAppShimHost() {} 20 virtual ~TestingAppShimHost() {}
21 21
22 bool ReceiveMessage(IPC::Message* message); 22 bool ReceiveMessage(IPC::Message* message);
23 23
24 const std::vector<IPC::Message*>& sent_messages() { 24 const std::vector<IPC::Message*>& sent_messages() {
25 return sent_messages_.get(); 25 return sent_messages_.get();
26 } 26 }
27 27
28 protected: 28 protected:
29 virtual bool Send(IPC::Message* message) OVERRIDE; 29 virtual bool Send(IPC::Message* message) override;
30 30
31 private: 31 private:
32 ScopedVector<IPC::Message> sent_messages_; 32 ScopedVector<IPC::Message> sent_messages_;
33 33
34 DISALLOW_COPY_AND_ASSIGN(TestingAppShimHost); 34 DISALLOW_COPY_AND_ASSIGN(TestingAppShimHost);
35 }; 35 };
36 36
37 bool TestingAppShimHost::ReceiveMessage(IPC::Message* message) { 37 bool TestingAppShimHost::ReceiveMessage(IPC::Message* message) {
38 bool handled = OnMessageReceived(*message); 38 bool handled = OnMessageReceived(*message);
39 delete message; 39 delete message;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 return param.a; 77 return param.a;
78 } 78 }
79 79
80 void SimulateDisconnect() { 80 void SimulateDisconnect() {
81 implicit_cast<IPC::Listener*>(host_.release())->OnChannelError(); 81 implicit_cast<IPC::Listener*>(host_.release())->OnChannelError();
82 } 82 }
83 83
84 protected: 84 protected:
85 virtual void OnShimLaunch(Host* host, 85 virtual void OnShimLaunch(Host* host,
86 apps::AppShimLaunchType launch_type, 86 apps::AppShimLaunchType launch_type,
87 const std::vector<base::FilePath>& file) OVERRIDE { 87 const std::vector<base::FilePath>& file) override {
88 ++launch_count_; 88 ++launch_count_;
89 if (launch_type == apps::APP_SHIM_LAUNCH_NORMAL) 89 if (launch_type == apps::APP_SHIM_LAUNCH_NORMAL)
90 ++launch_now_count_; 90 ++launch_now_count_;
91 host->OnAppLaunchComplete(launch_result_); 91 host->OnAppLaunchComplete(launch_result_);
92 } 92 }
93 93
94 virtual void OnShimClose(Host* host) OVERRIDE { ++close_count_; } 94 virtual void OnShimClose(Host* host) override { ++close_count_; }
95 95
96 virtual void OnShimFocus(Host* host, 96 virtual void OnShimFocus(Host* host,
97 apps::AppShimFocusType focus_type, 97 apps::AppShimFocusType focus_type,
98 const std::vector<base::FilePath>& file) OVERRIDE { 98 const std::vector<base::FilePath>& file) override {
99 ++focus_count_; 99 ++focus_count_;
100 } 100 }
101 101
102 virtual void OnShimSetHidden(Host* host, bool hidden) OVERRIDE {} 102 virtual void OnShimSetHidden(Host* host, bool hidden) override {}
103 103
104 virtual void OnShimQuit(Host* host) OVERRIDE { ++quit_count_; } 104 virtual void OnShimQuit(Host* host) override { ++quit_count_; }
105 105
106 apps::AppShimLaunchResult launch_result_; 106 apps::AppShimLaunchResult launch_result_;
107 int launch_count_; 107 int launch_count_;
108 int launch_now_count_; 108 int launch_now_count_;
109 int close_count_; 109 int close_count_;
110 int focus_count_; 110 int focus_count_;
111 int quit_count_; 111 int quit_count_;
112 112
113 private: 113 private:
114 virtual void SetUp() OVERRIDE { 114 virtual void SetUp() override {
115 testing::Test::SetUp(); 115 testing::Test::SetUp();
116 host_.reset(new TestingAppShimHost()); 116 host_.reset(new TestingAppShimHost());
117 } 117 }
118 118
119 scoped_ptr<TestingAppShimHost> host_; 119 scoped_ptr<TestingAppShimHost> host_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(AppShimHostTest); 121 DISALLOW_COPY_AND_ASSIGN(AppShimHostTest);
122 }; 122 };
123 123
124 124
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 apps::AppShimHandler::RemoveHandler(kTestAppId); 166 apps::AppShimHandler::RemoveHandler(kTestAppId);
167 } 167 }
168 168
169 TEST_F(AppShimHostTest, TestFailLaunch) { 169 TEST_F(AppShimHostTest, TestFailLaunch) {
170 apps::AppShimHandler::RegisterHandler(kTestAppId, this); 170 apps::AppShimHandler::RegisterHandler(kTestAppId, this);
171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND; 171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND;
172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); 172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL);
173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult()); 173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult());
174 apps::AppShimHandler::RemoveHandler(kTestAppId); 174 apps::AppShimHandler::RemoveHandler(kTestAppId);
175 } 175 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698