diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 01:50:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 01:50:05 +0000 |
| commit | 5b251f10c00377eb437bf11d52128ff7f359a5e3 (patch) | |
| tree | 56695914261a7a2d9ad8e8934080551c8db90452 /content/browser/renderer_host | |
| parent | 8eb21c922f41dd850ea71e7fb391e50f7b4a9f5f (diff) | |
| download | chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.zip chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.tar.gz chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.tar.bz2 | |
wm: public window_types.
Patch manually generated by:
$ git grep -l aura::client::WINDOW_TYPE | xargs sed -i -e 's/aura::client::WINDOW_TYPE/ui::wm::WINDOW_TYPE/g'
$ git commit -a -m.
$ git clang-format HEAD^ --style=Chromium
$ git commit -a -m.
* Move window_types.h header from ui/aura/client/ to ui/wm/public/
BUG=319638
TEST=ash_unittests, aura_unittests, views_unittests, unit_tests
R=ben@chromium.org
Review URL: https://codereview.chromium.org/115153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 2478b1b..dddc7b6 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -56,7 +56,6 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/client/window_types.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" @@ -76,6 +75,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" +#include "ui/wm/public/window_types.h" #if defined(OS_WIN) #include "base/win/windows_version.h" @@ -515,7 +515,7 @@ void RenderWidgetHostViewAura::InitAsPopup( old_child->popup_parent_host_view_ = NULL; } popup_parent_host_view_->popup_child_host_view_ = this; - window_->SetType(aura::client::WINDOW_TYPE_MENU); + window_->SetType(ui::wm::WINDOW_TYPE_MENU); window_->Init(ui::LAYER_TEXTURED); window_->SetName("RenderWidgetHostViewAura"); @@ -533,7 +533,7 @@ void RenderWidgetHostViewAura::InitAsPopup( void RenderWidgetHostViewAura::InitAsFullscreen( RenderWidgetHostView* reference_host_view) { is_fullscreen_ = true; - window_->SetType(aura::client::WINDOW_TYPE_NORMAL); + window_->SetType(ui::wm::WINDOW_TYPE_NORMAL); window_->Init(ui::LAYER_TEXTURED); window_->SetName("RenderWidgetHostViewAura"); window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); |