| Index: ui/views_content_client/views_content_browser_client.h
|
| diff --git a/ui/views/examples/content_client/examples_content_browser_client.h b/ui/views_content_client/views_content_browser_client.h
|
| similarity index 51%
|
| rename from ui/views/examples/content_client/examples_content_browser_client.h
|
| rename to ui/views_content_client/views_content_browser_client.h
|
| index db8824b9e56c87bec318637f6186c7fe642da84b..61e01d49596622a4367be342dabba7d8a05e760a 100644
|
| --- a/ui/views/examples/content_client/examples_content_browser_client.h
|
| +++ b/ui/views_content_client/views_content_browser_client.h
|
| @@ -1,42 +1,43 @@
|
| -// 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_CONTENT_BROWSER_CLIENT_H_
|
| -#define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_CONTENT_BROWSER_CLIENT_H_
|
| -
|
| -#include "base/macros.h"
|
| -#include "content/public/browser/content_browser_client.h"
|
| -
|
| -namespace content {
|
| -class ShellBrowserContext;
|
| -}
|
| -
|
| -namespace views {
|
| -namespace examples {
|
| -
|
| -class ExamplesBrowserMainParts;
|
| -
|
| -class ExamplesContentBrowserClient : public content::ContentBrowserClient {
|
| - public:
|
| - ExamplesContentBrowserClient();
|
| - virtual ~ExamplesContentBrowserClient();
|
| -
|
| - // content::ContentBrowserClient:
|
| - virtual content::BrowserMainParts* CreateBrowserMainParts(
|
| - const content::MainFunctionParams& parameters) OVERRIDE;
|
| - virtual net::URLRequestContextGetter* CreateRequestContext(
|
| - content::BrowserContext* browser_context,
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
|
| -
|
| - private:
|
| - ExamplesBrowserMainParts* examples_browser_main_parts_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ExamplesContentBrowserClient);
|
| -};
|
| -
|
| -} // namespace examples
|
| -} // namespace views
|
| -
|
| -#endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_CONTENT_BROWSER_CLIENT_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_BROWSER_CLIENT_H_
|
| +#define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_BROWSER_CLIENT_H_
|
| +
|
| +#include "base/macros.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
| +
|
| +namespace content {
|
| +class ShellBrowserContext;
|
| +}
|
| +
|
| +namespace ui {
|
| +
|
| +class ViewsContentClient;
|
| +class ViewsContentClientMainParts;
|
| +
|
| +class ViewsContentBrowserClient : public content::ContentBrowserClient {
|
| + public:
|
| + explicit ViewsContentBrowserClient(
|
| + ViewsContentClient* views_content_client);
|
| + virtual ~ViewsContentBrowserClient();
|
| +
|
| + // content::ContentBrowserClient:
|
| + virtual content::BrowserMainParts* CreateBrowserMainParts(
|
| + const content::MainFunctionParams& parameters) OVERRIDE;
|
| + virtual net::URLRequestContextGetter* CreateRequestContext(
|
| + content::BrowserContext* browser_context,
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
|
| +
|
| + private:
|
| + ViewsContentClientMainParts* views_content_main_parts_;
|
| + ViewsContentClient* views_content_client_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ViewsContentBrowserClient);
|
| +};
|
| +
|
| +} // namespace ui
|
| +
|
| +#endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_BROWSER_CLIENT_H_
|
|
|