summaryrefslogtreecommitdiffstats
path: root/apps/app_shim
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-27 15:29:39 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-27 15:29:39 +0000
commit88cd06107c1280ad59ba96273e49ffdc7558c86c (patch)
treece6c10c55031f89680181cc69cbf1462247f5e24 /apps/app_shim
parent35b149f40836c1d2dadafab6300730aa5c5d498f (diff)
downloadchromium_src-88cd06107c1280ad59ba96273e49ffdc7558c86c.zip
chromium_src-88cd06107c1280ad59ba96273e49ffdc7558c86c.tar.gz
chromium_src-88cd06107c1280ad59ba96273e49ffdc7558c86c.tar.bz2
Revert 208927 "Move ShellWindow into apps component."
broke build: ../../chrome/browser/ui/apps/chrome_shell_window_delegate.cc:7:31: fatal error: base/stringprintf.h: No such file or directory (I think it was moved to base/strings/stringprintf.h) > Move ShellWindow into apps component. > > This involves creating a new delegate type, ShellWindow::Delegate, which > is implemented in chrome. > > BUG=159366 > > Review URL: https://chromiumcodereview.appspot.com/16702003 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/18062007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_shim')
-rw-r--r--apps/app_shim/extension_app_shim_handler_mac.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_shim/extension_app_shim_handler_mac.cc b/apps/app_shim/extension_app_shim_handler_mac.cc
index c020fb6..eea475c 100644
--- a/apps/app_shim/extension_app_shim_handler_mac.cc
+++ b/apps/app_shim/extension_app_shim_handler_mac.cc
@@ -6,7 +6,6 @@
#include "apps/app_lifetime_monitor_factory.h"
#include "apps/app_shim/app_shim_messages.h"
-#include "apps/shell_window.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "chrome/browser/browser_process.h"
@@ -18,6 +17,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/extensions/native_app_window.h"
+#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/web_applications/web_app_mac.h"
#include "chrome/common/chrome_notification_types.h"