Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: athena/extensions/athena_app_delegate_base.cc

Issue 596493002: Add actiivity in factory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/extensions/chrome/extensions_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_factory.h" 7 #include "athena/activity/public/activity_factory.h"
8 #include "athena/activity/public/activity_manager.h"
9 #include "athena/env/public/athena_env.h" 8 #include "athena/env/public/athena_env.h"
10 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
11 #include "content/public/browser/web_contents_delegate.h" 10 #include "content/public/browser/web_contents_delegate.h"
12 #include "extensions/common/constants.h" 11 #include "extensions/common/constants.h"
13 #include "extensions/grit/extensions_browser_resources.h" 12 #include "extensions/grit/extensions_browser_resources.h"
14 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
15 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/geometry/rect.h" 15 #include "ui/gfx/geometry/rect.h"
17 16
18 namespace athena { 17 namespace athena {
19 namespace { 18 namespace {
20 19
21 content::WebContents* OpenURLInActivity(content::BrowserContext* context, 20 content::WebContents* OpenURLInActivity(content::BrowserContext* context,
22 const content::OpenURLParams& params) { 21 const content::OpenURLParams& params) {
23 // Force all links to open in a new activity. 22 // Force all links to open in a new activity.
24 Activity* activity = ActivityFactory::Get()->CreateWebActivity( 23 Activity* activity = ActivityFactory::Get()->CreateWebActivity(
25 context, base::string16(), params.url); 24 context, base::string16(), params.url);
26 ActivityManager::Get()->AddActivity(activity); 25 DCHECK(activity);
27 // TODO(oshima): Get the web cotnents from activity. 26 // TODO(oshima): Get the web cotnents from activity.
28 return NULL; 27 return NULL;
29 } 28 }
30 29
31 } // namespace 30 } // namespace
32 31
33 // This is a extra step to open a new Activity when a link is simply clicked 32 // 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). 33 // on an app activity (which usually replaces the content).
35 class AthenaAppDelegateBase::NewActivityContentsDelegate 34 class AthenaAppDelegateBase::NewActivityContentsDelegate
36 : public content::WebContentsDelegate { 35 : public content::WebContentsDelegate {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 void AthenaAppDelegateBase::SetTerminatingCallback( 95 void AthenaAppDelegateBase::SetTerminatingCallback(
97 const base::Closure& callback) { 96 const base::Closure& callback) {
98 if (!terminating_callback_.is_null()) 97 if (!terminating_callback_.is_null())
99 AthenaEnv::Get()->RemoveTerminatingCallback(terminating_callback_); 98 AthenaEnv::Get()->RemoveTerminatingCallback(terminating_callback_);
100 terminating_callback_ = callback; 99 terminating_callback_ = callback;
101 if (!terminating_callback_.is_null()) 100 if (!terminating_callback_.is_null())
102 AthenaEnv::Get()->AddTerminatingCallback(terminating_callback_); 101 AthenaEnv::Get()->AddTerminatingCallback(terminating_callback_);
103 } 102 }
104 103
105 } // namespace athena 104 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/extensions/chrome/extensions_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698