summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 20:49:23 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 20:49:23 +0000
commite628fde3462899ba06af2fbc5285563c456ed5c4 (patch)
treee3ed3eb98c0044b055606bdf8628191b9b99c17c /ash
parent23d6315575647756c4be985b895ec2c447e2f088 (diff)
downloadchromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.zip
chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.gz
chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.bz2
Emergency revert; rietveld broke; tree broke
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/shell/shell_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 5648c81..303d172 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "content/public/app/content_main.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
#include "ash/shell/content_client/shell_main_delegate.h"
#if defined(OS_WIN)