| Index: wm/shell/content_client/shell_content_browser_client.cc
|
| diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/wm/shell/content_client/shell_content_browser_client.cc
|
| similarity index 68%
|
| copy from ash/shell/content_client/shell_content_browser_client.cc
|
| copy to wm/shell/content_client/shell_content_browser_client.cc
|
| index 629d4b55920bdddcd6ce9481ecbed62c6a9826fc..58ba1682ee7845d496f74de690cc0210fd119d3d 100644
|
| --- a/ash/shell/content_client/shell_content_browser_client.cc
|
| +++ b/wm/shell/content_client/shell_content_browser_client.cc
|
| @@ -1,13 +1,12 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 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.
|
|
|
| -#include "ash/shell/content_client/shell_content_browser_client.h"
|
| +#include "wm/shell/content_client/shell_content_browser_client.h"
|
|
|
| -#include "ash/shell/content_client/shell_browser_main_parts.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| +#include "wm/shell/content_client/shell_browser_main_parts.h"
|
|
|
| -namespace ash {
|
| +namespace wm {
|
| namespace shell {
|
|
|
| ShellContentBrowserClient::ShellContentBrowserClient()
|
| @@ -27,5 +26,5 @@ content::ShellBrowserContext* ShellContentBrowserClient::browser_context() {
|
| return shell_browser_main_parts_->browser_context();
|
| }
|
|
|
| -} // namespace examples
|
| -} // namespace views
|
| +} // namespace shell
|
| +} // namespace wm
|
|
|