Consolidate dialog style flags and strings; etc.

ash/wm/system_modal_container_layout_manager.cc

 // Copyright (c) 2012 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 "ash/wm/system_modal_container_layout_manager.h"
 
-#include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
-namespace {
-
-class ModalBackgroundView : public views::View {
- public:
-  ModalBackgroundView() {}
-  virtual ~ModalBackgroundView() {}
-
-  // Overridden from views::View:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    canvas->FillRect(GetLocalBounds(), GetOverlayColor());
-  }
-
- private:
-  SkColor GetOverlayColor() {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kAuraGoogleDialogFrames)) {
-      return SK_ColorWHITE;
-    }
-    return SK_ColorBLACK;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(ModalBackgroundView);
-};
-
-}  // namespace
-
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, public:
 
 SystemModalContainerLayoutManager::SystemModalContainerLayoutManager(
     aura::Window* container)
     : container_(container),
       modal_background_(NULL) {
 }
 
 SystemModalContainerLayoutManager::~SystemModalContainerLayoutManager() {
@@ skipping 112 matching lines @@
 void SystemModalContainerLayoutManager::CreateModalBackground() {
   if (!modal_background_) {
     modal_background_ = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
     params.parent = container_;
     params.bounds = Shell::GetScreen()->GetDisplayNearestWindow(
         container_).bounds();
     modal_background_->Init(params);
     modal_background_->GetNativeView()->SetName(
         "SystemModalContainerLayoutManager.ModalBackground");
-    modal_background_->SetContentsView(new ModalBackgroundView);
+    views::View* contents_view = new views::View();
+    contents_view->set_background(views::Background::CreateSolidBackground(
+        CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableNewDialogStyle) ? SK_ColorWHITE : SK_ColorBLACK));
+    modal_background_->SetContentsView(contents_view);
     modal_background_->GetNativeView()->layer()->SetOpacity(0.0f);
   }
 
   ui::ScopedLayerAnimationSettings settings(
       modal_background_->GetNativeView()->layer()->GetAnimator());
   modal_background_->Show();
   modal_background_->GetNativeView()->layer()->SetOpacity(0.5f);
   container_->StackChildAtTop(modal_background_->GetNativeView());
 }
 
@@ skipping 42 matching lines @@
 void SystemModalContainerLayoutManager::RemoveModalWindow(
     aura::Window* window) {
   aura::Window::Windows::iterator it =
       std::find(modal_windows_.begin(), modal_windows_.end(), window);
   if (it != modal_windows_.end())
     modal_windows_.erase(it);
 }
 
 }  // namespace internal
 }  // namespace ash