summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_web_ui.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 03:51:58 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 03:51:58 +0000
commit2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch)
tree0371f49d1768902bf69e0130b55ec104258f5cf9 /chrome/browser/extensions/extension_web_ui.cc
parent49098f7091448e437190f23cc67a705df4abd079 (diff)
downloadchromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.zip
chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.gz
chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.bz2
Move PageTransition into content namespace. While I'm touching all these files, I've also updated it to use the enum naming convention in the Content API.
BUG=98716 Review URL: http://codereview.chromium.org/8253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_web_ui.cc')
-rw-r--r--chrome/browser/extensions/extension_web_ui.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index 2a14e58..3bde358 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -25,7 +25,7 @@
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/url_constants.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
#include "content/public/common/bindings_policy.h"
#include "net/base/file_stream.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -165,7 +165,7 @@ ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
extension_bookmark_manager_event_router_.reset(
new ExtensionBookmarkManagerEventRouter(profile, tab));
- link_transition_type_ = PageTransition::AUTO_BOOKMARK;
+ link_transition_type_ = content::PAGE_TRANSITION_AUTO_BOOKMARK;
}
}
@@ -351,7 +351,7 @@ void ExtensionWebUI::UnregisterAndReplaceOverride(const std::string& page,
// Don't use Reload() since |url| isn't the same as the internal URL
// that NavigationController has.
- tab->controller().LoadURL(url, url, PageTransition::RELOAD,
+ tab->controller().LoadURL(url, url, content::PAGE_TRANSITION_RELOAD,
std::string());
}
}