diff options
| author | oshima <oshima@chromium.org> | 2014-09-06 13:10:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-06 20:12:51 +0000 |
| commit | c986f7cd5ecd85ed3891ec78abfd60b7f8c20e0b (patch) | |
| tree | e4c9d7828143448b97806aece8de1e54a45d89cc /athena/main | |
| parent | 3115a3df298d733cb36306b351a00f55f8452214 (diff) | |
| download | chromium_src-c986f7cd5ecd85ed3891ec78abfd60b7f8c20e0b.zip chromium_src-c986f7cd5ecd85ed3891ec78abfd60b7f8c20e0b.tar.gz chromium_src-c986f7cd5ecd85ed3891ec78abfd60b7f8c20e0b.tar.bz2 | |
Move launcher API to athena/main/public
BUG=None
Review URL: https://codereview.chromium.org/542413002
Cr-Commit-Position: refs/heads/master@{#293633}
Diffstat (limited to 'athena/main')
| -rw-r--r-- | athena/main/athena_launcher.cc | 2 | ||||
| -rw-r--r-- | athena/main/athena_main.cc | 2 | ||||
| -rw-r--r-- | athena/main/athena_main.gyp | 6 | ||||
| -rw-r--r-- | athena/main/public/athena_launcher.h (renamed from athena/main/athena_launcher.h) | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc index 50e9df2..4efd319 100644 --- a/athena/main/athena_launcher.cc +++ b/athena/main/athena_launcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "athena/main/athena_launcher.h" +#include "athena/main/public/athena_launcher.h" #include "athena/activity/public/activity_factory.h" #include "athena/activity/public/activity_manager.h" diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc index e19d7f4..4959a95 100644 --- a/athena/main/athena_main.cc +++ b/athena/main/athena_main.cc @@ -8,8 +8,8 @@ #include "athena/env/public/athena_env.h" #include "athena/extensions/public/extensions_delegate.h" #include "athena/main/athena_content_client.h" -#include "athena/main/athena_launcher.h" #include "athena/main/athena_renderer_pdf_helper.h" +#include "athena/main/public/athena_launcher.h" #include "athena/screen/public/screen_manager.h" #include "base/command_line.h" #include "base/file_util.h" diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp index a13e151..7c61c43 100644 --- a/athena/main/athena_main.gyp +++ b/athena/main/athena_main.gyp @@ -37,13 +37,13 @@ 'athena_content_client.cc', 'athena_content_client.h', 'athena_launcher.cc', - 'athena_launcher.h', 'athena_renderer_pdf_helper.cc', 'athena_renderer_pdf_helper.h', - 'url_search_provider.cc', - 'url_search_provider.h', 'placeholder.cc', 'placeholder.h', + 'public/athena_launcher.h', + 'url_search_provider.cc', + 'url_search_provider.h', ], }, { diff --git a/athena/main/athena_launcher.h b/athena/main/public/athena_launcher.h index cf08dc7..73d4891 100644 --- a/athena/main/athena_launcher.h +++ b/athena/main/public/athena_launcher.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ATHENA_MAIN_ATHENA_LAUNCHER_H_ -#define ATHENA_MAIN_ATHENA_LAUNCHER_H_ +#ifndef ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ +#define ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ #include "base/memory/ref_counted.h" @@ -36,4 +36,4 @@ void ShutdownAthena(); } // namespace athena -#endif // ATHENA_MAIN_ATHENA_LAUNCHER_H_ +#endif // ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ |