summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 01:36:04 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 01:36:04 +0000
commit4b87f561bd7b850fdec7225ed1bb9d7cbe3f990e (patch)
treebf7cbc01aa8e587ee7fc1647255fab332197269e /apps
parentbe3da6812e249ee08a833c7af8bc01cc930c0c87 (diff)
downloadchromium_src-4b87f561bd7b850fdec7225ed1bb9d7cbe3f990e.zip
chromium_src-4b87f561bd7b850fdec7225ed1bb9d7cbe3f990e.tar.gz
chromium_src-4b87f561bd7b850fdec7225ed1bb9d7cbe3f990e.tar.bz2
Fix compile error in ShellDesktopController with clang
error: expected function body after function declarator ... outputs) OVERRIDE { TBR=derat@chromium.org Review URL: https://codereview.chromium.org/213283008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/browser/shell_desktop_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index 0aa4b11..37ed8e3 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/apps/shell/browser/shell_desktop_controller.cc
@@ -75,7 +75,7 @@ aura::WindowTreeHost* ShellDesktopController::GetWindowTreeHost() {
#if defined(OS_CHROMEOS) && defined(USE_X11)
void ShellDesktopController::OnDisplayModeChanged(
- const std::vector<ui::OutputConfigurator::DisplayState>& outputs) OVERRIDE {
+ const std::vector<ui::OutputConfigurator::DisplayState>& outputs) {
gfx::Size size = GetPrimaryDisplaySize();
if (!size.IsEmpty())
wm_test_helper_->host()->UpdateRootWindowSize(size);