| Index: wm/shell/shell_main_parts.cc
|
| diff --git a/ash/shell/shell_main_parts.cc b/wm/shell/shell_main_parts.cc
|
| similarity index 74%
|
| copy from ash/shell/shell_main_parts.cc
|
| copy to wm/shell/shell_main_parts.cc
|
| index 739950308bfe2055492acc9fc391e6b75f07b682..872fce342e2f86d5995ae4b2836007837d4b08a9 100644
|
| --- a/ash/shell/shell_main_parts.cc
|
| +++ b/wm/shell/shell_main_parts.cc
|
| @@ -1,14 +1,14 @@
|
| -// 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/shell_main_parts.h"
|
| +#include "wm/shell/shell_main_parts.h"
|
|
|
| #include "base/i18n/icu_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
|
|
| -namespace ash {
|
| +namespace wm {
|
| namespace shell {
|
|
|
| void PreMainMessageLoopStart() {
|
| @@ -17,5 +17,5 @@ void PreMainMessageLoopStart() {
|
| ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
|
| }
|
|
|
| -} // namespace ash
|
| +} // namespace wm
|
| } // namespace shell
|
|
|