diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 16:37:18 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 16:37:18 +0000 |
| commit | 59ad4bbdfc458e607e0cf068857d6fb4b44a8711 (patch) | |
| tree | d6b9157b47e3fd49b4d886513dfdcf53c6a00ebd /chrome/browser/chromeos/panels | |
| parent | 68fed3efc25d17a5bebd7405b8171bba287385fc (diff) | |
| download | chromium_src-59ad4bbdfc458e607e0cf068857d6fb4b44a8711.zip chromium_src-59ad4bbdfc458e607e0cf068857d6fb4b44a8711.tar.gz chromium_src-59ad4bbdfc458e607e0cf068857d6fb4b44a8711.tar.bz2 | |
aura: Touch state file after first browser is ready.
This creates a chromeos::InitialBrowserWindowObserver class
for Aura that replicates some behavior for tests that's
currently performed by the X window manager: when the first
browser window is created,
/var/run/state/windowmanager/initial-chrome-window-mapped is
touched (the window manager actually writes the window's ID
to the file, but that doesn't make sense under Aura and
luckily doesn't appear to be depended on by any tests).
This fixes Chrome OS's security_ProfilePermissions.BWSI and
security_ProfilePermissions.login autotests, which otherwise
time out when run against an Aura build.
I'm also moving existing X-window-manager-related files that
are currently in the chromeos/ directory to
chromeos/legacy_window_manager/.
BUG=chromium-os:22974,chromium-os:22896
TEST=manual: observed that tests no longer time out
Review URL: http://codereview.chromium.org/8539051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/panels')
| -rw-r--r-- | chrome/browser/chromeos/panels/panel_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index 0bdced9..3a6e1b2 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -15,7 +15,7 @@ #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" #if defined(TOOLKIT_USES_GTK) -#include "chrome/browser/chromeos/wm_ipc.h" +#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" #endif namespace chromeos { |