OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/apps/chrome_apps_client.h" | 5 #include "chrome/browser/apps/chrome_apps_client.h" |
6 | 6 |
7 #include "apps/app_window.h" | 7 #include "apps/app_window.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 apps::AppWindow* ChromeAppsClient::CreateAppWindow( | 59 apps::AppWindow* ChromeAppsClient::CreateAppWindow( |
60 content::BrowserContext* context, | 60 content::BrowserContext* context, |
61 const extensions::Extension* extension) { | 61 const extensions::Extension* extension) { |
62 #if defined(OS_ANDROID) | 62 #if defined(OS_ANDROID) |
63 return NULL; | 63 return NULL; |
64 #else | 64 #else |
65 return new apps::AppWindow(context, new ChromeAppWindowDelegate, extension); | 65 return new apps::AppWindow(context, new ChromeAppWindowDelegate, extension); |
66 #endif | 66 #endif |
67 } | 67 } |
68 | 68 |
69 void ChromeAppsClient::StartKeepAlive() { | 69 void ChromeAppsClient::IncrementKeepAliveCount() { |
70 #if !defined(OS_ANDROID) | 70 #if !defined(OS_ANDROID) |
71 chrome::StartKeepAlive(); | 71 chrome::IncrementKeepAliveCount(); |
72 #endif | 72 #endif |
73 } | 73 } |
74 | 74 |
75 void ChromeAppsClient::EndKeepAlive() { | 75 void ChromeAppsClient::DecrementKeepAliveCount() { |
76 #if !defined(OS_ANDROID) | 76 #if !defined(OS_ANDROID) |
77 chrome::EndKeepAlive(); | 77 chrome::DecrementKeepAliveCount(); |
78 #endif | 78 #endif |
79 } | 79 } |
OLD | NEW |