diff options
author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:13:31 +0000 |
---|---|---|
committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:13:31 +0000 |
commit | 50462bf085b6504b0fe0d947664348870b0f26c7 (patch) | |
tree | 94474e4a310b97410ef4a449edd7d31d8d629abc /chrome/browser/chrome_browser_main_extra_parts_aura.cc | |
parent | 3a08f3fcd05e5f4b703b043ee1a7ff48cc4c86f4 (diff) | |
download | chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.zip chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.tar.gz chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.tar.bz2 |
Add ChromeBrowserMainExtraParts for non main parts. (take 3)
This was originally submitted as http://codereview.chromium.org/8539038/ which was reverted because of a failing test on win.
This reverts the code back to a single instance of BrowserMainParts, with auxillary parts (Gtk, Views, Aura, Touch) implemented from a new base class, ChromeBrowserParts, which has a Chrome specific interface, allowing initialization to be better subdivided.
This should fix the notifications auto tests.
This CL also addresses the test failure on win (and a test failure on linux_chromeos triggered by the windows fix).
BUG=103821
TEST=Make sure all tests and autotests run
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8480032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_extra_parts_aura.cc')
-rw-r--r-- | chrome/browser/chrome_browser_main_extra_parts_aura.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc new file mode 100644 index 0000000..ea5214f --- /dev/null +++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc @@ -0,0 +1,26 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/chrome_browser_main_extra_parts_aura.h" +#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" +#include "ui/aura/desktop.h" +#include "ui/aura_shell/shell.h" + +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/system/runtime_environment.h" +#endif + +ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() + : ChromeBrowserMainExtraParts() { +} + +void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() { +#if defined(OS_CHROMEOS) + if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) + aura::Desktop::set_use_fullscreen_host_window(true); +#endif + + // Shell takes ownership of ChromeShellDelegate. + aura_shell::Shell::CreateInstance(new ChromeShellDelegate); +} |