| Index: apps/shell/shell_main_delegate.h
|
| diff --git a/apps/shell/app_shell_main_delegate.h b/apps/shell/shell_main_delegate.h
|
| similarity index 55%
|
| rename from apps/shell/app_shell_main_delegate.h
|
| rename to apps/shell/shell_main_delegate.h
|
| index 86aae446170732bf7211caff8e28d2deca61cd0d..98c21cdcb058d88af5b81dc6d765cb4763a9a5bb 100644
|
| --- a/apps/shell/app_shell_main_delegate.h
|
| +++ b/apps/shell/shell_main_delegate.h
|
| @@ -2,22 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
|
| -#define APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
|
| +#ifndef APPS_SHELL_SHELL_MAIN_DELEGATE_H_
|
| +#define APPS_SHELL_SHELL_MAIN_DELEGATE_H_
|
|
|
| -#include "apps/shell/app_shell_content_client.h"
|
| +#include "apps/shell/shell_content_client.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/app/content_main_delegate.h"
|
|
|
| namespace apps {
|
|
|
| -class AppShellContentBrowserClient;
|
| +class ShellContentBrowserClient;
|
|
|
| -class AppShellMainDelegate : public content::ContentMainDelegate {
|
| +class ShellMainDelegate : public content::ContentMainDelegate {
|
| public:
|
| - AppShellMainDelegate();
|
| - virtual ~AppShellMainDelegate();
|
| + ShellMainDelegate();
|
| + virtual ~ShellMainDelegate();
|
|
|
| // ContentMainDelegate implementation:
|
| virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
|
| @@ -27,12 +27,12 @@ class AppShellMainDelegate : public content::ContentMainDelegate {
|
| static void InitializeResourceBundle();
|
|
|
| private:
|
| - scoped_ptr<AppShellContentBrowserClient> browser_client_;
|
| - AppShellContentClient content_client_;
|
| + scoped_ptr<ShellContentBrowserClient> browser_client_;
|
| + ShellContentClient content_client_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AppShellMainDelegate);
|
| + DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
|
| };
|
|
|
| } // namespace apps
|
|
|
| -#endif // APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
|
| +#endif // APPS_SHELL_SHELL_MAIN_DELEGATE_H_
|
|
|