summaryrefslogtreecommitdiffstats
path: root/mojo/examples/media_viewer
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-26 22:50:12 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-26 22:50:12 +0000
commitb17d3b5564896a8b2e1b9ca9cbd6022caa456490 (patch)
tree1d97ff4914db880ab0584955581bb117da5d1485 /mojo/examples/media_viewer
parent4f25bc2eef85795db352ef572193c2d54650a35f (diff)
downloadchromium_src-b17d3b5564896a8b2e1b9ca9cbd6022caa456490.zip
chromium_src-b17d3b5564896a8b2e1b9ca9cbd6022caa456490.tar.gz
chromium_src-b17d3b5564896a8b2e1b9ca9cbd6022caa456490.tar.bz2
Mojo demo: fix random background.
BUG=378153 TEST=None R=ben@chromium.org Review URL: https://codereview.chromium.org/337263006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/media_viewer')
-rw-r--r--mojo/examples/media_viewer/media_viewer.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/mojo/examples/media_viewer/media_viewer.cc b/mojo/examples/media_viewer/media_viewer.cc
index e4ea4c6..2470c46 100644
--- a/mojo/examples/media_viewer/media_viewer.cc
+++ b/mojo/examples/media_viewer/media_viewer.cc
@@ -30,6 +30,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
+#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/label_button.h"
@@ -141,6 +142,9 @@ class ControlPanel : public views::ButtonListener {
widget_delegate->GetContentsView()->SetLayoutManager(
new views::BoxLayout(views::BoxLayout::kHorizontal, 5, 2, 5));
+ widget_delegate->GetContentsView()->set_background(
+ views::Background::CreateSolidBackground(SK_ColorLTGRAY));
+
for (int type = 0; type < CONTROL_COUNT; ++type) {
views::Button* button = new views::LabelButton(
this, base::ASCIIToUTF16(kNames[type]));