athena/main/athena_main.cc - Issue 412713002: Move apps/shell to extensions/shell. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(3774)

My Issues | Starred Open | Closed | All

Unified Diff: athena/main/athena_main.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« athena/main/athena_app_window_controller.cc ('K') | « athena/main/athena_app_window_controller.cc ('k') | athena/main/athena_main.gyp » ('j') | athena/resources/athena_resources.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: athena/main/athena_main.cc

diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc

index 628603427b79476c0aa4eff44267e3310dd48b7c..a8063e78ce8a802db1ee8d5d37bdfad66a23164a 100644

--- a/athena/main/athena_main.cc

+++ b/athena/main/athena_main.cc

@@ -2,13 +2,6 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "apps/shell/app/shell_main_delegate.h"

-#include "apps/shell/browser/shell_browser_main_delegate.h"

-#include "apps/shell/browser/shell_content_browser_client.h"

-#include "apps/shell/browser/shell_desktop_controller.h"

-#include "apps/shell/browser/shell_extension_system.h"

-#include "apps/shell/common/switches.h"

-#include "apps/shell/renderer/shell_renderer_main_delegate.h"

#include "athena/content/public/content_activity_factory.h"

#include "athena/content/public/content_app_model_builder.h"

#include "athena/home/public/home_card.h"

@@ -24,6 +17,13 @@

#include "base/file_util.h"

#include "base/path_service.h"

#include "content/public/app/content_main.h"

+#include "extensions/shell/app/shell_main_delegate.h"

+#include "extensions/shell/browser/shell_browser_main_delegate.h"

+#include "extensions/shell/browser/shell_content_browser_client.h"

+#include "extensions/shell/browser/shell_desktop_controller.h"

+#include "extensions/shell/browser/shell_extension_system.h"

+#include "extensions/shell/common/switches.h"

+#include "extensions/shell/renderer/shell_renderer_main_delegate.h"

#include "ui/app_list/app_list_switches.h"

#include "ui/aura/window_tree_host.h"

#include "ui/base/resource/resource_bundle.h"

« athena/main/athena_app_window_controller.cc ('K') | « athena/main/athena_app_window_controller.cc ('k') | athena/main/athena_main.gyp » ('j') | athena/resources/athena_resources.gyp » ('J')

Powered by Google App Engine

This is Rietveld 408576698