| Index: wm/shell/content_client/shell_main_delegate.cc
|
| diff --git a/ash/shell/content_client/shell_main_delegate.cc b/wm/shell/content_client/shell_main_delegate.cc
|
| similarity index 76%
|
| copy from ash/shell/content_client/shell_main_delegate.cc
|
| copy to wm/shell/content_client/shell_main_delegate.cc
|
| index 343ba27f04cbfb74ff694f93d71e3dee0527053c..579775eb1750ac8a75d667d245831f2ec1386f05 100644
|
| --- a/ash/shell/content_client/shell_main_delegate.cc
|
| +++ b/wm/shell/content_client/shell_main_delegate.cc
|
| @@ -1,18 +1,17 @@
|
| -// 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_main_delegate.h"
|
| +#include "wm/shell/content_client/shell_main_delegate.h"
|
| +
|
| +#include <string>
|
|
|
| -#include "ash/shell/content_client/shell_content_browser_client.h"
|
| #include "base/command_line.h"
|
| -#include "base/file_path.h"
|
| -#include "base/path_service.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/base/ui_base_paths.h"
|
| +#include "wm/shell/content_client/shell_content_browser_client.h"
|
|
|
| -namespace ash {
|
| +namespace wm {
|
| namespace shell {
|
|
|
| ShellMainDelegate::ShellMainDelegate() {
|
| @@ -45,4 +44,4 @@ void ShellMainDelegate::InitializeResourceBundle() {
|
| }
|
|
|
| } // namespace shell
|
| -} // namespace ash
|
| +} // namespace wm
|
|
|