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

Unified Diff: components/native_app_window.gypi

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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/components.gyp ('k') | components/native_app_window/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/native_app_window.gypi
diff --git a/components/native_app_window.gypi b/components/native_app_window.gypi
index dd68ff6c26aaf7f0b6cd6094c991a2313ca7bf80..32975b4339bbdafdd288574a6baa09999d397007 100644
--- a/components/native_app_window.gypi
+++ b/components/native_app_window.gypi
@@ -1,6 +1,9 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+
+# TODO(tapted): Convert these from static_library -> component once web_modal is
+# converted.
{
'targets': [
{
@@ -8,19 +11,54 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- '../content/content.gyp:content_browser',
- '../extensions/extensions.gyp:extensions_browser',
- '../extensions/extensions.gyp:extensions_common',
'../skia/skia.gyp:skia',
- '../ui/views/views.gyp:views',
+ 'web_modal',
+ ],
+ 'defines': [
+ 'NATIVE_APP_WINDOW_IMPLEMENTATION',
],
'include_dirs': [
'..',
],
'sources': [
- 'native_app_window/native_app_window_views.cc',
- 'native_app_window/native_app_window_views.h',
+ 'native_app_window/app_window_create_params.h',
+ 'native_app_window/app_window_create_params.cc',
+ 'native_app_window/draggable_region.cc',
+ 'native_app_window/draggable_region.h',
+ 'native_app_window/native_app_window.h',
+ 'native_app_window/native_app_window_delegate.h',
+ 'native_app_window/native_app_window_export.h',
+ 'native_app_window/size_constraints.cc',
+ 'native_app_window/size_constraints.h',
],
},
],
+ 'conditions': [
+ ['toolkit_views==1', {
+ 'targets': [
+ {
+ 'target_name': 'native_app_window_views',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../content/content.gyp:content_browser',
+ '../skia/skia.gyp:skia',
+ '../ui/views/views.gyp:views',
+ 'native_app_window',
+ 'web_modal',
+ ],
+ 'defines': [
+ 'NATIVE_APP_WINDOW_VIEWS_IMPLEMENTATION',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'native_app_window/native_app_window_views.cc',
+ 'native_app_window/native_app_window_views.h',
+ ],
+ },
+ ],
+ }],
+ ]
}
« no previous file with comments | « components/components.gyp ('k') | components/native_app_window/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698