Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3068)

Unified Diff: apps/shell/browser/shell_desktop_controller.cc

Issue 213283008: Fix compile error with clang and use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_desktop_controller.cc
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index 0aa4b1157ddd4820105f3d5db713c794a4d96721..37ed8e38753d3132fd303dcc62d4541ce6780888 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698