Remove non USE_AURA code from views files.

Remove non USE_AURA code from views files.

BUG=330735
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266059

[Ben Goodger (Google), 2014-04-23 20:26:18]

So I think some of this cleanup is good, but with some amount of it you may
collide with the views-on-mac port that tapted is bringing up. Trent, can you
take a look at this and let me know if you'd like elliot to retain any of these
ifdefs for the time being?

[tapted, 2014-04-23 23:38:08]

On 2014/04/23 20:26:18, Ben Goodger (Google) wrote:
> So I think some of this cleanup is good, but with some amount of it you may
> collide with the views-on-mac port that tapted is bringing up. Trent, can you
> take a look at this and let me know if you'd like elliot to retain any of
these
> ifdefs for the time being?

Thanks for looping me in! I had a look through. I think this is good as is -
lgtm. Better to bring things back in as-needed I think (hopefully without the
#ifdefs)

chrome/browser isn't going to switch wholesale to views on Mac in one go. The
main initial focus is the app list; I pointed a couple there that might be
needed sooner. However most of those I was getting rid of anyway, since it's
just related to compositing/layers which should work OK on Mac without aura.

https://codereview.chromium.org/246633004/diff/20001/ui/app_list/views/app_li...
File ui/app_list/views/app_list_view.cc (left):

https://codereview.chromium.org/246633004/diff/20001/ui/app_list/views/app_li...
ui/app_list/views/app_list_view.cc:314: #if defined(USE_AURA)
I think this and one below were the only USE_AURA #ifdefs I was keeping around
in the app_list code, but I can bring it back after poking around for
alternatives.

https://codereview.chromium.org/246633004/diff/20001/ui/app_list/views/app_li...
ui/app_list/views/app_list_view.cc:343: #if defined(USE_AURA) &&
!defined(OS_CHROMEOS)
mac-views won't like this either :)

https://codereview.chromium.org/246633004/diff/20001/ui/app_list/views/apps_g...
File ui/app_list/views/apps_grid_view.cc (left):

https://codereview.chromium.org/246633004/diff/20001/ui/app_list/views/apps_g...
ui/app_list/views/apps_grid_view.cc:1188: #if defined(USE_AURA) &&
!defined(OS_WIN)
This one.. I'll actually need to refactor drag and drop quite a bit anyway.

[Elliot Glaysher, 2014-04-24 00:13:51]

ptal

[tapted, 2014-04-24 01:20:23]

https://codereview.chromium.org/246633004/diff/40001/ui/app_list/views/app_li...
File ui/app_list/views/app_list_view.cc (right):

https://codereview.chromium.org/246633004/diff/40001/ui/app_list/views/app_li...
ui/app_list/views/app_list_view.cc:27: #include "ui/aura/window.h"
oops - sorry I was a bit vague. To compile on mac, the reintroduced #ifdefs
would need the ui/aura/* headers guarded too (here and in apps_grid_view.cc).

However, I'm happy to do this when I activate the views app list on mac. It will
be tricky to get everything right without a compile (a mac-views fyi bot is
coming.. but I need to get more targets compiling first). I also see it as a
good opportunity for some potential cleanups in app_list :).

I have a stashed CL (not too old..) in http://crrev.com/240053009 for turning on
the views app list on mac. You can see it's mostly what you have here, but there
are some new changes as well to actually get it compiling.

So, tl;dr: don't worry too much about mac-views. Patchset 3 will be less churn
than Patchset 2, but in either case it's minor and ultimately helps analyze the
design.

[Elliot Glaysher, 2014-04-24 20:51:06]

https://codereview.chromium.org/246633004/diff/40001/ui/app_list/views/app_li...
File ui/app_list/views/app_list_view.cc (right):

https://codereview.chromium.org/246633004/diff/40001/ui/app_list/views/app_li...
ui/app_list/views/app_list_view.cc:27: #include "ui/aura/window.h"
On 2014/04/24 01:20:24, tapted wrote:
> oops - sorry I was a bit vague. To compile on mac, the reintroduced #ifdefs
> would need the ui/aura/* headers guarded too (here and in apps_grid_view.cc).
> 
> However, I'm happy to do this when I activate the views app list on mac. It
will
> be tricky to get everything right without a compile (a mac-views fyi bot is
> coming.. but I need to get more targets compiling first). I also see it as a
> good opportunity for some potential cleanups in app_list :).
> 
> I have a stashed CL (not too old..) in http://crrev.com/240053009 for turning
on
> the views app list on mac. You can see it's mostly what you have here, but
there
> are some new changes as well to actually get it compiling.
> 
> So, tl;dr: don't worry too much about mac-views. Patchset 3 will be less churn
> than Patchset 2, but in either case it's minor and ultimately helps analyze
the
> design.

I reverted all of ui/app_list/. I don't want to conflict with anything you're
doing.

[Ben Goodger (Google), 2014-04-24 21:34:39]

lgtm

[Elliot Glaysher, 2014-04-24 21:36:06]

The CQ bit was checked by erg@chromium.org

[commit-bot: I haz the power, 2014-04-24 22:02:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/erg@chromium.org/246633004/60001

[commit-bot: I haz the power, 2014-04-25 00:08:53]

Change committed as 266059