| 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 "athena/extensions/athena_app_delegate_base.h" | 5 #include "athena/extensions/athena_app_delegate_base.h" |
| 6 | 6 |
| 7 #include "athena/activity/public/activity.h" | 7 #include "athena/activity/public/activity.h" |
| 8 #include "athena/activity/public/activity_factory.h" | 8 #include "athena/activity/public/activity_factory.h" |
| 9 #include "athena/env/public/athena_env.h" | 9 #include "athena/env/public/athena_env.h" |
| 10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // namespace | 31 } // namespace |
| 32 | 32 |
| 33 // This is a extra step to open a new Activity when a link is simply clicked | 33 // This is a extra step to open a new Activity when a link is simply clicked |
| 34 // on an app activity (which usually replaces the content). | 34 // on an app activity (which usually replaces the content). |
| 35 class AthenaAppDelegateBase::NewActivityContentsDelegate | 35 class AthenaAppDelegateBase::NewActivityContentsDelegate |
| 36 : public content::WebContentsDelegate { | 36 : public content::WebContentsDelegate { |
| 37 public: | 37 public: |
| 38 NewActivityContentsDelegate() {} | 38 NewActivityContentsDelegate() {} |
| 39 virtual ~NewActivityContentsDelegate() {} | 39 ~NewActivityContentsDelegate() override {} |
| 40 | 40 |
| 41 // content::WebContentsDelegate: | 41 // content::WebContentsDelegate: |
| 42 virtual content::WebContents* OpenURLFromTab( | 42 content::WebContents* OpenURLFromTab( |
| 43 content::WebContents* source, | 43 content::WebContents* source, |
| 44 const content::OpenURLParams& params) override { | 44 const content::OpenURLParams& params) override { |
| 45 if (!source) | 45 if (!source) |
| 46 return nullptr; | 46 return nullptr; |
| 47 return OpenURLInActivity(source->GetBrowserContext(), params); | 47 return OpenURLInActivity(source->GetBrowserContext(), params); |
| 48 } | 48 } |
| 49 | 49 |
| 50 private: | 50 private: |
| 51 DISALLOW_COPY_AND_ASSIGN(NewActivityContentsDelegate); | 51 DISALLOW_COPY_AND_ASSIGN(NewActivityContentsDelegate); |
| 52 }; | 52 }; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 void AthenaAppDelegateBase::SetTerminatingCallback( | 96 void AthenaAppDelegateBase::SetTerminatingCallback( |
| 97 const base::Closure& callback) { | 97 const base::Closure& callback) { |
| 98 if (!terminating_callback_.is_null()) | 98 if (!terminating_callback_.is_null()) |
| 99 AthenaEnv::Get()->RemoveTerminatingCallback(terminating_callback_); | 99 AthenaEnv::Get()->RemoveTerminatingCallback(terminating_callback_); |
| 100 terminating_callback_ = callback; | 100 terminating_callback_ = callback; |
| 101 if (!terminating_callback_.is_null()) | 101 if (!terminating_callback_.is_null()) |
| 102 AthenaEnv::Get()->AddTerminatingCallback(terminating_callback_); | 102 AthenaEnv::Get()->AddTerminatingCallback(terminating_callback_); |
| 103 } | 103 } |
| 104 | 104 |
| 105 } // namespace athena | 105 } // namespace athena |
| OLD | NEW |