Chromium Code Reviews| Index: apps/apps_client.cc |
| diff --git a/extensions/common/extensions_client.cc b/apps/apps_client.cc |
| similarity index 52% |
| copy from extensions/common/extensions_client.cc |
| copy to apps/apps_client.cc |
| index e7f936dfbdf1c7ee09ebd6df0cbe9fc1f14b62ec..c49efb315fc8ca2b8fc3b2ff725b3970801485b6 100644 |
| --- a/extensions/common/extensions_client.cc |
| +++ b/apps/apps_client.cc |
| @@ -2,31 +2,27 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "apps/apps_client.h" |
| + |
| #include "base/basictypes.h" |
|
tapted
2013/09/04 01:08:35
nit: I don't think this is used for anything
benwells
2013/09/10 16:48:50
Surprisingly I get this error without it:
../../ap
tapted
2013/09/10 20:46:09
Ah drat. nullptr can not come soon enough..
|
| -#include "extensions/common/extensions_client.h" |
| -namespace extensions { |
| +namespace apps { |
| namespace { |
| -ExtensionsClient* g_client = NULL; |
| - |
| -void Initialize(ExtensionsClient* client) { |
| - client->RegisterManifestHandlers(); |
| -} |
| +AppsClient* g_client = NULL; |
| } // namespace |
| -ExtensionsClient* ExtensionsClient::Get() { |
| +AppsClient* AppsClient::Get() { |
| return g_client; |
| } |
| -void ExtensionsClient::Set(ExtensionsClient* client) { |
| +void AppsClient::Set(AppsClient* client) { |
| // This can happen in unit tests, where the utility thread runs in-process. |
| if (g_client) |
| return; |
|
tapted
2013/09/04 01:08:35
nit: blank line after early return?
benwells
2013/09/10 16:48:50
I mainly do that to break up slightly longer block
|
| g_client = client; |
| - Initialize(g_client); |
| } |
| -} // namespace extensions |
| +} // namespace apps |