Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: ash/wm/modal_container_layout_manager.cc

Issue 9166014: Allow a Views client to provide a default frameview for window widgets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/dialog_frame_view.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/modal_container_layout_manager.cc
===================================================================
--- ash/wm/modal_container_layout_manager.cc (revision 117168)
+++ ash/wm/modal_container_layout_manager.cc (working copy)
@@ -4,10 +4,12 @@
#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"
@@ -30,10 +32,18 @@
// 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);
};
« no previous file with comments | « ash/wm/dialog_frame_view.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698