summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-20 11:30:41 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-20 11:30:41 +0000
commitde7d61ff0d16a335b4c5199bc638205df91700a5 (patch)
treebcd14deb2b6b242e2fc5e20bc136f177c2aa7c18 /ash
parent8162d4474a101a16cc729c94e979cb3216e2aa9d (diff)
downloadchromium_src-de7d61ff0d16a335b4c5199bc638205df91700a5.zip
chromium_src-de7d61ff0d16a335b4c5199bc638205df91700a5.tar.gz
chromium_src-de7d61ff0d16a335b4c5199bc638205df91700a5.tar.bz2
[content shell] move browser process stuff into browser/ subdir
BUG=180021 R=marja@chromium.org TBR=joi@chromium.org,ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/23316003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/shell/content_client/shell_browser_main_parts.cc4
-rw-r--r--ash/shell/content_client/shell_content_browser_client.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index fae491f..1dc0b3e 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -18,8 +18,8 @@
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "content/public/common/content_switches.h"
-#include "content/shell/shell_browser_context.h"
-#include "content/shell/shell_net_log.h"
+#include "content/shell/browser/shell_browser_context.h"
+#include "content/shell/browser/shell_net_log.h"
#include "net/base/net_module.h"
#include "ui/aura/client/stacking_client.h"
#include "ui/aura/env.h"
diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc
index 93fc834..ec24bc7 100644
--- a/ash/shell/content_client/shell_content_browser_client.cc
+++ b/ash/shell/content_client/shell_content_browser_client.cc
@@ -5,7 +5,7 @@
#include "ash/shell/content_client/shell_content_browser_client.h"
#include "ash/shell/content_client/shell_browser_main_parts.h"
-#include "content/shell/shell_browser_context.h"
+#include "content/shell/browser/shell_browser_context.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace ash {