diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-21 02:23:24 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-21 02:23:24 +0000 |
| commit | 01cd50546b954afe76c9060ed2116bdff97283a0 (patch) | |
| tree | add5168008adc5a57365e2319822a82d4ebb6dfd /ui/views/examples | |
| parent | 30b97dfcaf27a615e608f0db9ce50897e1be9e23 (diff) | |
| download | chromium_src-01cd50546b954afe76c9060ed2116bdff97283a0.zip chromium_src-01cd50546b954afe76c9060ed2116bdff97283a0.tar.gz chromium_src-01cd50546b954afe76c9060ed2116bdff97283a0.tar.bz2 | |
Aura: Don't set a minimum size for our windows on Linux.
BUG=123332
TEST=none
Review URL: http://codereview.chromium.org/10115041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples')
| -rw-r--r-- | ui/views/examples/content_client/examples_browser_main_parts.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc index e1233e3..711d784 100644 --- a/ui/views/examples/content_client/examples_browser_main_parts.cc +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc @@ -24,6 +24,7 @@ #if defined(USE_AURA) #if !defined(USE_ASH) +#include "ui/aura/single_monitor_manager.h" #include "ui/views/widget/desktop_native_widget_helper_aura.h" #endif #include "ui/aura/desktop/desktop_stacking_client.h" @@ -68,6 +69,9 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() { browser_context_.reset(new content::ShellBrowserContext); #if defined(USE_AURA) +#if !defined(USE_ASH) + aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); +#endif stacking_client_.reset(new aura::DesktopStackingClient); #endif views_delegate_.reset(new ExamplesViewsDelegate); |