OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/apps/chrome_apps_client.h" | 5 #include "chrome/browser/ui/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 29 matching lines...) Expand all Loading... |
40 apps::AppWindow* ChromeAppsClient::CreateAppWindow( | 40 apps::AppWindow* ChromeAppsClient::CreateAppWindow( |
41 content::BrowserContext* context, | 41 content::BrowserContext* context, |
42 const extensions::Extension* extension) { | 42 const extensions::Extension* extension) { |
43 #if defined(OS_ANDROID) | 43 #if defined(OS_ANDROID) |
44 return NULL; | 44 return NULL; |
45 #else | 45 #else |
46 return new apps::AppWindow(context, new ChromeAppDelegate, extension); | 46 return new apps::AppWindow(context, new ChromeAppDelegate, extension); |
47 #endif | 47 #endif |
48 } | 48 } |
49 | 49 |
50 apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow( | 50 extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow( |
51 apps::AppWindow* window, | 51 apps::AppWindow* window, |
52 const apps::AppWindow::CreateParams& params) { | 52 const apps::AppWindow::CreateParams& params) { |
53 #if defined(OS_ANDROID) | 53 #if defined(OS_ANDROID) |
54 return NULL; | 54 return NULL; |
55 #else | 55 #else |
56 return CreateNativeAppWindowImpl(window, params); | 56 return CreateNativeAppWindowImpl(window, params); |
57 #endif | 57 #endif |
58 } | 58 } |
59 | 59 |
60 void ChromeAppsClient::IncrementKeepAliveCount() { | 60 void ChromeAppsClient::IncrementKeepAliveCount() { |
61 #if !defined(OS_ANDROID) | 61 #if !defined(OS_ANDROID) |
62 chrome::IncrementKeepAliveCount(); | 62 chrome::IncrementKeepAliveCount(); |
63 #endif | 63 #endif |
64 } | 64 } |
65 | 65 |
66 void ChromeAppsClient::DecrementKeepAliveCount() { | 66 void ChromeAppsClient::DecrementKeepAliveCount() { |
67 #if !defined(OS_ANDROID) | 67 #if !defined(OS_ANDROID) |
68 chrome::DecrementKeepAliveCount(); | 68 chrome::DecrementKeepAliveCount(); |
69 #endif | 69 #endif |
70 } | 70 } |
OLD | NEW |