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 #ifndef CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_ |
6 #define CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_ | 6 #define CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_ |
7 | 7 |
8 #include "apps/apps_client.h" | 8 #include "apps/ui/apps_client.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 | 11 |
12 template<typename T> struct DefaultSingletonTraits; | 12 template <typename T> |
13 struct DefaultSingletonTraits; | |
benwells
2014/07/31 06:23:41
Did git cl format change this?
Matt Giuca
2014/07/31 07:13:38
Yes.
(And I was forced to run it, since I renamed
| |
13 | 14 |
14 // The implementation of AppsClient for Chrome. | 15 // The implementation of AppsClient for Chrome. |
15 class ChromeAppsClient : public apps::AppsClient { | 16 class ChromeAppsClient : public apps::AppsClient { |
16 public: | 17 public: |
17 ChromeAppsClient(); | 18 ChromeAppsClient(); |
18 virtual ~ChromeAppsClient(); | 19 virtual ~ChromeAppsClient(); |
19 | 20 |
20 // Get the LazyInstance for ChromeAppsClient. | 21 // Get the LazyInstance for ChromeAppsClient. |
21 static ChromeAppsClient* GetInstance(); | 22 static ChromeAppsClient* GetInstance(); |
22 | 23 |
23 private: | 24 private: |
24 friend struct DefaultSingletonTraits<ChromeAppsClient>; | 25 friend struct DefaultSingletonTraits<ChromeAppsClient>; |
25 | 26 |
26 // apps::AppsClient | 27 // apps::AppsClient |
27 virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts() | 28 virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts() |
28 OVERRIDE; | 29 OVERRIDE; |
29 virtual apps::AppWindow* CreateAppWindow( | 30 virtual apps::AppWindow* CreateAppWindow( |
30 content::BrowserContext* context, | 31 content::BrowserContext* context, |
31 const extensions::Extension* extension) OVERRIDE; | 32 const extensions::Extension* extension) OVERRIDE; |
33 virtual apps::NativeAppWindow* CreateNativeAppWindow( | |
34 apps::AppWindow* window, | |
35 const apps::AppWindow::CreateParams& params) OVERRIDE; | |
32 virtual void IncrementKeepAliveCount() OVERRIDE; | 36 virtual void IncrementKeepAliveCount() OVERRIDE; |
33 virtual void DecrementKeepAliveCount() OVERRIDE; | 37 virtual void DecrementKeepAliveCount() OVERRIDE; |
34 | 38 |
39 // Implemented in platform specific code. | |
40 static apps::NativeAppWindow* CreateNativeAppWindowImpl( | |
41 apps::AppWindow* window, | |
42 const apps::AppWindow::CreateParams& params); | |
43 | |
35 DISALLOW_COPY_AND_ASSIGN(ChromeAppsClient); | 44 DISALLOW_COPY_AND_ASSIGN(ChromeAppsClient); |
36 }; | 45 }; |
37 | 46 |
38 #endif // CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_ | 47 #endif // CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_ |
OLD | NEW |