| Index: athena/screen_lock/shell/shell_screen_lock_manager.cc
|
| diff --git a/athena/content/shell/web_activity_helpers.cc b/athena/screen_lock/shell/shell_screen_lock_manager.cc
|
| similarity index 53%
|
| copy from athena/content/shell/web_activity_helpers.cc
|
| copy to athena/screen_lock/shell/shell_screen_lock_manager.cc
|
| index f5c1d90c0768d697f9c68e665fd9dfcb76fc9791..bb9c235670deb07b5303298b798c09f86ba3f244 100644
|
| --- a/athena/content/shell/web_activity_helpers.cc
|
| +++ b/athena/screen_lock/shell/shell_screen_lock_manager.cc
|
| @@ -2,11 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "athena/content/web_activity_helpers.h"
|
| +#include "athena/screen_lock/screen_lock_manager_base.h"
|
| +#include "base/macros.h"
|
|
|
| namespace athena {
|
|
|
| -void AttachWebActivityHelpers(content::WebContents* contents) {
|
| +ScreenLockManager* ScreenLockManager::Create() {
|
| + return NULL;
|
| }
|
|
|
| -} // namespace athena
|
| +} // namespace athena
|
|
|