| 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 #ifndef ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ | 5 #ifndef ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ |
| 6 #define ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ | 6 #define ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ |
| 7 | 7 |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "extensions/browser/app_window/app_delegate.h" | 10 #include "extensions/browser/app_window/app_delegate.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 content::BrowserContext* context, | 26 content::BrowserContext* context, |
| 27 content::WebContents* source, | 27 content::WebContents* source, |
| 28 const content::OpenURLParams& params) OVERRIDE; | 28 const content::OpenURLParams& params) OVERRIDE; |
| 29 virtual void AddNewContents(content::BrowserContext* context, | 29 virtual void AddNewContents(content::BrowserContext* context, |
| 30 content::WebContents* new_contents, | 30 content::WebContents* new_contents, |
| 31 WindowOpenDisposition disposition, | 31 WindowOpenDisposition disposition, |
| 32 const gfx::Rect& initial_pos, | 32 const gfx::Rect& initial_pos, |
| 33 bool user_gesture, | 33 bool user_gesture, |
| 34 bool* was_blocked) OVERRIDE; | 34 bool* was_blocked) OVERRIDE; |
| 35 virtual int PreferredIconSize() OVERRIDE; | 35 virtual int PreferredIconSize() OVERRIDE; |
| 36 virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE; | |
| 37 virtual bool IsWebContentsVisible( | 36 virtual bool IsWebContentsVisible( |
| 38 content::WebContents* web_contents) OVERRIDE; | 37 content::WebContents* web_contents) OVERRIDE; |
| 39 virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; | 38 virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; |
| 40 | 39 |
| 41 scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_; | 40 scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_; |
| 42 base::Closure terminating_callback_; | 41 base::Closure terminating_callback_; |
| 43 | 42 |
| 44 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegateBase); | 43 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegateBase); |
| 45 }; | 44 }; |
| 46 | 45 |
| 47 } // namespace athena | 46 } // namespace athena |
| 48 | 47 |
| 49 #endif // ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ | 48 #endif // ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ |
| OLD | NEW |