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

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

Issue 616253002: Extract NativeAppWindow from src/extensions Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: might fix athena. similarity=33 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/extensions/athena_app_window_client_base.h ('k') | chrome/browser/DEPS » ('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_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/browser/app_window/app_window.h"
10 #include "extensions/common/extension.h" 11 #include "extensions/common/extension.h"
11 12
12 namespace athena { 13 namespace athena {
13 14
14 AthenaAppWindowClientBase::AthenaAppWindowClientBase() { 15 AthenaAppWindowClientBase::AthenaAppWindowClientBase() {
15 } 16 }
16 17
17 AthenaAppWindowClientBase::~AthenaAppWindowClientBase() { 18 AthenaAppWindowClientBase::~AthenaAppWindowClientBase() {
18 } 19 }
19 20
20 extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow( 21 native_app_window::NativeAppWindow*
22 AthenaAppWindowClientBase::CreateNativeAppWindow(
21 extensions::AppWindow* app_window, 23 extensions::AppWindow* app_window,
22 const extensions::AppWindow::CreateParams& params) { 24 const native_app_window::AppWindowCreateParams& params) {
23 AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews; 25 AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews;
24 native_window->Init(app_window, params); 26 native_window->Init(app_window, params);
25 ActivityFactory::Get()->CreateAppActivity(app_window, 27 ActivityFactory::Get()->CreateAppActivity(app_window,
26 native_window->GetWebView()); 28 native_window->GetWebView());
27 return native_window; 29 return native_window;
28 } 30 }
29 31
30 } // namespace athena 32 } // namespace athena
OLDNEW
« no previous file with comments | « athena/extensions/athena_app_window_client_base.h ('k') | chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698