Allow a Views client to provide a default frameview for window widgets.

ash/wm/modal_container_layout_manager.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 "ash/wm/modal_container_layout_manager.h"
 
+#include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/modality_event_filter.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/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 class ScreenView : public views::View {
  public:
   ScreenView() {}
   virtual ~ScreenView() {}
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    canvas->FillRect(SK_ColorBLACK, GetLocalBounds());
+    canvas->FillRect(GetOverlayColor(), GetLocalBounds());
   }
 
  private:
+  SkColor GetOverlayColor() {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kAuraGoogleDialogFrames)) {
+      return SK_ColorWHITE;
+    }
+    return SK_ColorBLACK;
+  }
+
   DISALLOW_COPY_AND_ASSIGN(ScreenView);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModalContainerLayoutManager, public:
 
 ModalContainerLayoutManager::ModalContainerLayoutManager(
     aura::Window* container)
@@ skipping 134 matching lines @@
 
 void ModalContainerLayoutManager::HideModalScreen() {
   Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get());
   ui::LayerAnimator::ScopedSettings settings(
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
 }
 
 }  // namespace internal
 }  // namespace ash