summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 01:47:21 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 01:47:21 +0000
commit71d87e16092141b903c9cb031b2bd28d9fb82bd6 (patch)
treed244870dc165506dc20c29b6b69cf8262146e721 /apps
parent94124a943ac247a8e095a1dc2dfca6d80c08ef56 (diff)
downloadchromium_src-71d87e16092141b903c9cb031b2bd28d9fb82bd6.zip
chromium_src-71d87e16092141b903c9cb031b2bd28d9fb82bd6.tar.gz
chromium_src-71d87e16092141b903c9cb031b2bd28d9fb82bd6.tar.bz2
Fix linux_chromeos_clang compile for app_shell
http://crrev.com/234634 changed aura::RootWindow so it isn't an aura::Window anymore. BUG=None TEST=compiles R=derat@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/61303003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/app_shell_browser_main_parts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc
index c56918d..3cd7e79 100644
--- a/apps/shell/app_shell_browser_main_parts.cc
+++ b/apps/shell/app_shell_browser_main_parts.cc
@@ -50,7 +50,7 @@ void AppShellBrowserMainParts::PreMainMessageLoopRun() {
// window with a WebView just to ensure that the content module is properly
// initialized.
ShowWebViewWindow(browser_context_.get(),
- minimal_shell_->root_window());
+ minimal_shell_->root_window()->window());
}
bool AppShellBrowserMainParts::MainMessageLoopRun(int* result_code) {