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

Unified Diff: chrome/browser/apps/chrome_apps_client.cc

Issue 436503002: Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient. (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
Download patch
Index: chrome/browser/apps/chrome_apps_client.cc
diff --git a/chrome/browser/apps/chrome_apps_client.cc b/chrome/browser/apps/chrome_apps_client.cc
deleted file mode 100644
index 22b52dd622aa4f3ee4bb7689a72fe1ecae4df4d8..0000000000000000000000000000000000000000
--- a/chrome/browser/apps/chrome_apps_client.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 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 "chrome/browser/apps/chrome_apps_client.h"
-
-#include "apps/app_window.h"
-#include "base/memory/singleton.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "extensions/common/extension.h"
-
-// TODO(jamescook): We probably shouldn't compile this class at all on Android.
-// See http://crbug.com/343612
-#if !defined(OS_ANDROID)
-#include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/ui/apps/chrome_app_delegate.h"
-#include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
-#endif
-
-ChromeAppsClient::ChromeAppsClient() {}
-
-ChromeAppsClient::~ChromeAppsClient() {}
-
-// static
-ChromeAppsClient* ChromeAppsClient::GetInstance() {
- return Singleton<ChromeAppsClient,
- LeakySingletonTraits<ChromeAppsClient> >::get();
-}
-
-std::vector<content::BrowserContext*>
- ChromeAppsClient::GetLoadedBrowserContexts() {
- std::vector<Profile*> profiles =
- g_browser_process->profile_manager()->GetLoadedProfiles();
- return std::vector<content::BrowserContext*>(profiles.begin(),
- profiles.end());
-}
-
-apps::AppWindow* ChromeAppsClient::CreateAppWindow(
- content::BrowserContext* context,
- const extensions::Extension* extension) {
-#if defined(OS_ANDROID)
- return NULL;
-#else
- return new apps::AppWindow(
- context, new ChromeAppDelegate, new ChromeAppWindowDelegate, extension);
-#endif
-}
-
-void ChromeAppsClient::IncrementKeepAliveCount() {
-#if !defined(OS_ANDROID)
- chrome::IncrementKeepAliveCount();
-#endif
-}
-
-void ChromeAppsClient::DecrementKeepAliveCount() {
-#if !defined(OS_ANDROID)
- chrome::DecrementKeepAliveCount();
-#endif
-}

Powered by Google App Engine
This is Rietveld 408576698