ui/aura/demo/demo_main.cc - Issue 910453002: Create PowerMonitor while starting aura_demo and views_examples_exe

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/demo/demo_main.cc

Issue 910453002: Create PowerMonitor while starting aura_demo and views_examples_exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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

Index: ui/aura/demo/demo_main.cc

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc

index 5200b012c126fb8181515d37d783e808de3fb302..c589824926056ec3f51bbf5da2ae9f75e53ec082 100644

--- a/ui/aura/demo/demo_main.cc

+++ b/ui/aura/demo/demo_main.cc

@@ -7,6 +7,8 @@

#include "base/i18n/icu_util.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

+#include "base/power_monitor/power_monitor.h"

+#include "base/power_monitor/power_monitor_device_source.h"

#include "third_party/skia/include/core/SkXfermode.h"

#include "ui/aura/client/default_capture_client.h"

#include "ui/aura/client/window_tree_client.h"

@@ -126,6 +128,9 @@ int DemoMain() {

// Create the message-loop here before creating the root window.

base::MessageLoopForUI message_loop;

+ base::PowerMonitor power_monitor(make_scoped_ptr(

+ new base::PowerMonitorDeviceSource));

aura::Env::CreateInstance(true);

aura::Env::GetInstance()->set_context_factory(context_factory.get());

scoped_ptr<aura::TestScreen> test_screen(

« no previous file with comments | « no previous file | ui/views/examples/examples_main.cc » ('j') | no next file with comments »