commit 868fa2fe829687343ffae624259930155e16dbd8
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
tree 54d316199dd9739c57c3aacd131853bbd6554a94
parent bb1bdbd796f966b5bf11f40ecbea12621c7bfac9

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

ash/launcher/launcher_delegate.h

diff --git a/ash/launcher/launcher_delegate.h b/ash/launcher/launcher_delegate.h
index a5c1842..cb80588 100644
--- a/ash/launcher/launcher_delegate.h
+++ b/ash/launcher/launcher_delegate.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher_types.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace aura {