Shell related switches -> aura shell switches.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/tooltip_client.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_types.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "base/bind.h"
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
 #include "ui/gfx/gl/gl_bindings.h"
@@ skipping 61 matching lines @@
     : host_(host),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       is_fullscreen_(false),
       popup_parent_host_view_(NULL),
       is_loading_(false),
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
       current_surface_(gfx::kNullPluginWindow),
 #endif
       skip_schedule_paint_(false) {
   host_->SetView(this);
-  window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
+  window_->SetProperty(aura::client::kTooltipTextKey, &tooltip_);
   aura::client::SetActivationDelegate(window_, this);
 }
 
 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
 }
 
 void RenderWidgetHostViewAura::InitAsChild() {
   window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
   window_->SetName("RenderWidgetHostViewAura");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, RenderWidgetHostView implementation:
 
 void RenderWidgetHostViewAura::InitAsPopup(
     RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
   popup_parent_host_view_ =
       static_cast<RenderWidgetHostViewAura*>(parent_host_view);
-  window_->SetType(aura::WINDOW_TYPE_MENU);
+  window_->SetType(aura::client::WINDOW_TYPE_MENU);
   window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
   window_->SetName("RenderWidgetHostViewAura");
 
   window_->SetParent(NULL);
   Show();
 
   // |pos| is in root window coordinates. So convert it to
   // |popup_parent_host_view_|'s coordinates first.
   gfx::Point origin = pos.origin();
   aura::Window::ConvertPointToWindow(
       aura::RootWindow::GetInstance(),
       popup_parent_host_view_->window_, &origin);
   SetBounds(gfx::Rect(origin, pos.size()));
 }
 
 void RenderWidgetHostViewAura::InitAsFullscreen(
     RenderWidgetHostView* reference_host_view) {
   is_fullscreen_ = true;
-  window_->SetType(aura::WINDOW_TYPE_NORMAL);
+  window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
   window_->SetName("RenderWidgetHostViewAura");
-  window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+  window_->SetIntProperty(aura::client::kShowStateKey,
+                          ui::SHOW_STATE_FULLSCREEN);
   window_->SetParent(NULL);
   Show();
   Focus();
 }
 
 RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const {
   return host_;
 }
 
 void RenderWidgetHostViewAura::DidBecomeSelected() {
@@ skipping 475 matching lines @@
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }