summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
commit4344a3c6d9e58ab7b9ee613024186ef34f619c30 (patch)
treed9c19d0f9fe541d6fff8250fe9f799ec367953e6 /content/content_common.gypi
parent6f90b9e6f0ad978c11510fa362791aa896fdde7d (diff)
downloadchromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.zip
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.gz
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.bz2
Bring back the file dialogs for chrome AURA.
The AURA specific changes have been isolated in select_file_dialog_win.cc where we retrieve the top level window handle from the AURA root window. As per a discussion with Ben fixed the layering violation where in ui\base was depending on gfx::NativeView/NativeWindow which led to a layering violation on AURA. This was via ui\base\dialogs Moved the files out of ui\base\dialogs into a new gypi file shell_dialogs.gypi which lives in ui. It is included by ui.gyp The relevant code in chrome browser now depends on the shell_dialogs target created by shell_dialogs.gypi. The ui/base/dialogs folder will be deleted in a subsequent change. There were problems applying this patch on the try bots when I added the deletes to this change. BUG=170483 Review URL: https://codereview.chromium.org/11956031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 6b2e986..b2c4953 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -11,6 +11,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
+ '../ui/ui.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
'../webkit/support/webkit_support.gyp:user_agent',
],