| Index: ui/views_content_client/views_content_main_delegate.h
|
| diff --git a/ui/views/examples/content_client/examples_main_delegate.h b/ui/views_content_client/views_content_main_delegate.h
|
| similarity index 49%
|
| rename from ui/views/examples/content_client/examples_main_delegate.h
|
| rename to ui/views_content_client/views_content_main_delegate.h
|
| index 1bfd5c3fbbefe446052dc956d477f5c820c3163f..f685ff96af9866e05e0e7c81e66db366d80dff58 100644
|
| --- a/ui/views/examples/content_client/examples_main_delegate.h
|
| +++ b/ui/views_content_client/views_content_main_delegate.h
|
| @@ -1,40 +1,38 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_MAIN_DELEGATE_H_
|
| -#define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_MAIN_DELEGATE_H_
|
| -
|
| -#include <string>
|
| -
|
| -#include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "content/public/app/content_main_delegate.h"
|
| -#include "content/shell/common/shell_content_client.h"
|
| -
|
| -namespace views {
|
| -namespace examples {
|
| -
|
| -class ExamplesContentBrowserClient;
|
| -
|
| -class ExamplesMainDelegate : public content::ContentMainDelegate {
|
| - public:
|
| - ExamplesMainDelegate();
|
| - virtual ~ExamplesMainDelegate();
|
| -
|
| - // content::ContentMainDelegate implementation
|
| - virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
|
| - virtual void PreSandboxStartup() OVERRIDE;
|
| - virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
|
| -
|
| - private:
|
| - scoped_ptr<ExamplesContentBrowserClient> browser_client_;
|
| - content::ShellContentClient content_client_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ExamplesMainDelegate);
|
| -};
|
| -
|
| -} // namespace examples
|
| -} // namespace views
|
| -
|
| -#endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_MAIN_DELEGATE_H_
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
| +
|
| +#ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
|
| +#define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
|
| +
|
| +#include "base/macros.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "content/public/app/content_main_delegate.h"
|
| +#include "content/shell/common/shell_content_client.h"
|
| +
|
| +namespace ui {
|
| +
|
| +class ViewsContentBrowserClient;
|
| +class ViewsContentClient;
|
| +
|
| +class ViewsContentMainDelegate : public content::ContentMainDelegate {
|
| + public:
|
| + explicit ViewsContentMainDelegate(ViewsContentClient* views_content_client);
|
| + virtual ~ViewsContentMainDelegate();
|
| +
|
| + // content::ContentMainDelegate implementation
|
| + virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
|
| + virtual void PreSandboxStartup() OVERRIDE;
|
| + virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
|
| +
|
| + private:
|
| + scoped_ptr<ViewsContentBrowserClient> browser_client_;
|
| + content::ShellContentClient content_client_;
|
| + ViewsContentClient* views_content_client_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ViewsContentMainDelegate);
|
| +};
|
| +
|
| +} // namespace ui
|
| +
|
| +#endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
|
|
|