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_window_client_base.cc

Issue 596623005: Do not show the activity widget in ActivityManager::AddActivity (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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
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_window_client_base.h" 5 #include "athena/extensions/athena_app_window_client_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" 8 #include "athena/activity/public/activity_manager.h"
9 #include "athena/extensions/athena_native_app_window_views.h" 9 #include "athena/extensions/athena_native_app_window_views.h"
10 #include "extensions/common/extension.h" 10 #include "extensions/common/extension.h"
11 11
12 namespace athena { 12 namespace athena {
13 13
14 AthenaAppWindowClientBase::AthenaAppWindowClientBase() { 14 AthenaAppWindowClientBase::AthenaAppWindowClientBase() {
15 } 15 }
16 16
17 AthenaAppWindowClientBase::~AthenaAppWindowClientBase() { 17 AthenaAppWindowClientBase::~AthenaAppWindowClientBase() {
18 } 18 }
19 19
20 extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow( 20 extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow(
21 extensions::AppWindow* app_window, 21 extensions::AppWindow* app_window,
22 const extensions::AppWindow::CreateParams& params) { 22 const extensions::AppWindow::CreateParams& params) {
23 AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews; 23 AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews;
24 native_window->Init(app_window, params); 24 native_window->Init(app_window, params);
25 Activity* app_activity = ActivityFactory::Get()->CreateAppActivity( 25 ActivityFactory::Get()->CreateAppActivity(app_window,
26 app_window, native_window->GetWebView()); 26 native_window->GetWebView());
27 ActivityManager::Get()->AddActivity(app_activity);
28 return native_window; 27 return native_window;
29 } 28 }
30 29
31 void AthenaAppWindowClientBase::IncrementKeepAliveCount() { 30 void AthenaAppWindowClientBase::IncrementKeepAliveCount() {
32 // No need to keep track of KeepAlive count on ChromeOS. 31 // No need to keep track of KeepAlive count on ChromeOS.
33 } 32 }
34 33
35 void AthenaAppWindowClientBase::DecrementKeepAliveCount() { 34 void AthenaAppWindowClientBase::DecrementKeepAliveCount() {
36 // No need to keep track of KeepAlive count on ChromeOS. 35 // No need to keep track of KeepAlive count on ChromeOS.
37 } 36 }
38 37
39 } // namespace athena 38 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698