summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.h
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 20:02:25 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 20:02:25 +0000
commita8ba6369d632006245574b26a2b4ee8cc21ca25f (patch)
tree60dd9ebffc2d967a8f0fd4261fefe7966719d8af /chrome_frame/external_tab.h
parentbee4104e372d9cbf9e3d2c15b405e96676ebc5f3 (diff)
downloadchromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.zip
chromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.tar.gz
chromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.tar.bz2
Part 2 of reapplying r64637.
Move the automation message files from chrome/test/automation to chrome/common/. This requires a temporary override to chrome/common/DEPS until Part 3 lands. BUG=51409 TEST=compiles Review URL: http://codereview.chromium.org/4758001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab.h')
-rw-r--r--chrome_frame/external_tab.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h
index 5411528..8affbc1 100644
--- a/chrome_frame/external_tab.h
+++ b/chrome_frame/external_tab.h
@@ -14,8 +14,8 @@
#include "base/scoped_comptr_win.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
-#include "chrome/common//page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/page_zoom.h"
#include "chrome_frame/cfproxy.h"
#include "chrome_frame/task_marshaller.h"
#include "googleurl/src/gurl.h"