diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 22:20:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 22:20:39 +0000 |
| commit | d7d0b1aafad48193090a742be0a89c79fc7ddd9e (patch) | |
| tree | 68b39b24a15f049edfa24d3e3c524f9c50f2105e /ui/views/views.gyp | |
| parent | c5d58b7883b06a0869136596efed3da19b45e584 (diff) | |
| download | chromium_src-d7d0b1aafad48193090a742be0a89c79fc7ddd9e.zip chromium_src-d7d0b1aafad48193090a742be0a89c79fc7ddd9e.tar.gz chromium_src-d7d0b1aafad48193090a742be0a89c79fc7ddd9e.tar.bz2 | |
Attempt 2 at: Adds a trivial views based table implementation (only supports single
selection, even for grouptableview) and wires it up for hung renderer
and ssl client certificate.
Only change is adding OVERRIDEs.
BUG=109665
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/9187027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/views.gyp')
| -rw-r--r-- | ui/views/views.gyp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 8fa0304..fec9a00 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. { @@ -207,10 +207,14 @@ 'controls/tabbed_pane/tabbed_pane_listener.h', 'controls/table/group_table_model.h', 'controls/table/group_table_view.h', + 'controls/table/group_table_view_views.cc', + 'controls/table/group_table_view_views.h', 'controls/table/group_table_view_win.cc', 'controls/table/group_table_view_win.h', 'controls/table/table_view.h', 'controls/table/table_view_observer.h', + 'controls/table/table_view_views.cc', + 'controls/table/table_view_views.h', 'controls/table/table_view_win.cc', 'controls/table/table_view_win.h', 'controls/textfield/gtk_views_entry.cc', @@ -437,6 +441,10 @@ 'controls/menu/menu_config_views.cc', 'controls/menu/menu_item_view_views.cc', 'controls/menu/menu_separator_views.cc', + 'controls/table/group_table_view_views.cc', + 'controls/table/group_table_view_views.h', + 'controls/table/table_view_views.cc', + 'controls/table/table_view_views.h', 'controls/tree/tree_view_views.cc', 'controls/tree/tree_view_views.h', ], @@ -540,6 +548,9 @@ ], }], ], + 'sources/': [ + ['exclude', 'controls/table/table_view_unittest.cc'], + ], }], ['OS=="win"', { 'link_settings': { @@ -659,17 +670,6 @@ 'include_dirs': [ '../third_party/wtl/include', ], - }, { # OS!="win" - 'sources/': [ - ['exclude', 'examples/table_example.cc'], - ['exclude', 'examples/table_example.h'], - ], - }], - ['use_aura==1', { - 'sources/': [ - ['exclude', 'examples/table_example.cc'], - ['exclude', 'examples/table_example.h'], - ], }], ], }, # target_name: views_examples_lib |