Skip to content

Commit

Permalink
Initialize Material Design in views_examples_with_content_exe
Browse files Browse the repository at this point in the history
This is required since r386582 requires MaterialDesignController
initialization to be explicit.

It was fixed for views_examples in r388338

This applies a similar fix for views_content_client which is used by
views_examples_with_content_exe

Also, add an OWNERS file to ui/views_content_client with tapted@.
Probably should have done this when I made it in r272902 but I was too
timid.

BUG=605126

Review URL: https://codereview.chromium.org/1903393003

Cr-Commit-Position: refs/heads/master@{#389037}
  • Loading branch information
tapted authored and Commit bot committed Apr 22, 2016
1 parent c82f868 commit a23372c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions ui/views_content_client/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tapted@chromium.org
2 changes: 2 additions & 0 deletions ui/views_content_client/views_content_client_main_parts.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "content/public/browser/context_factory.h"
#include "content/shell/browser/shell_browser_context.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/views/test/desktop_test_views_delegate.h"

namespace ui {
Expand All @@ -24,6 +25,7 @@ ViewsContentClientMainParts::~ViewsContentClientMainParts() {
}

void ViewsContentClientMainParts::PreMainMessageLoopRun() {
ui::MaterialDesignController::Initialize();
ui::InitializeInputMethodForTesting();
browser_context_.reset(new content::ShellBrowserContext(false, NULL));

Expand Down

0 comments on commit a23372c

Please sign in to comment.