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

Unified Diff: content/shell/shell.cc

Issue 10054038: Support WebView in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « content/shell/shell.h ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell.cc
===================================================================
--- content/shell/shell.cc (revision 131874)
+++ content/shell/shell.cc (working copy)
@@ -32,7 +32,7 @@
wait_until_done_(false),
window_(NULL),
url_edit_view_(NULL)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
, default_edit_wnd_proc_(0)
#endif
{
« no previous file with comments | « content/shell/shell.h ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698