summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 18:40:01 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 18:40:01 +0000
commitcccd376dcdb2cc8855c7ca1fd649a948d68d6f08 (patch)
tree5b7dc1ac2b4ae5f67130558958d43eb72070425a /chrome_frame
parentd344a107c64835954d494f2e4477c7326c31abd8 (diff)
downloadchromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.zip
chromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.tar.gz
chromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.tar.bz2
Part 3 of reapplying r64637.
This moves SecurityStyle and PageType into chrome/common/ and removes the chrome_frame dependency on chrome/browser/tab_contents/. This undoes the temporary DEPS hack on chrome/common/. BUG=51409 TEST=compiles Review URL: http://codereview.chromium.org/4697005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_active_document.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index dd3faaa..fdb81dfe 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -31,7 +31,7 @@
#include "base/win/scoped_variant.h"
#include "grit/generated_resources.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/navigation_types.h"
#include "chrome/common/page_zoom.h"