Commit 7653e059 authored by sky@chromium.org's avatar sky@chromium.org

Make views_aura_desktop depend upon resources so that we don't have to

copy over .pak files and it works on a clean build. Also define
NativeComboboxWrapper::CreateWrapper for aura.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: http://codereview.chromium.org/7779053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99817 0039d316-1c4b-4281-b951-d872f2087c98
parent 59a6da1a
...@@ -373,4 +373,15 @@ void NativeComboboxViews::ShowDropDownMenu() { ...@@ -373,4 +373,15 @@ void NativeComboboxViews::ShowDropDownMenu() {
SetMouseHandler(NULL); SetMouseHandler(NULL);
} }
////////////////////////////////////////////////////////////////////////////////
// NativeComboboxWrapper, public:
#if defined(USE_AURA)
// static
NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
Combobox* combobox) {
return new NativeComboboxViews(combobox);
}
#endif
} // namespace views } // namespace views
...@@ -844,6 +844,7 @@ ...@@ -844,6 +844,7 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../base/base.gyp:base_i18n', '../base/base.gyp:base_i18n',
'../chrome/chrome.gyp:packed_resources',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment