diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
| commit | 2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch) | |
| tree | 0371f49d1768902bf69e0130b55ec104258f5cf9 /content/shell | |
| parent | 49098f7091448e437190f23cc67a705df4abd079 (diff) | |
| download | chromium_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 'content/shell')
| -rw-r--r-- | content/shell/shell.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_browser_main.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/content/shell/shell.cc b/content/shell/shell.cc index 65eb1ea..fef561e 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -77,7 +77,7 @@ void Shell::LoadURL(const GURL& url) { tab_contents_->controller().LoadURL( url, GURL(), - PageTransition::TYPED, + content::PAGE_TRANSITION_TYPED, std::string()); tab_contents_->Focus(); } diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 8ac87d3..ae3b0c1 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -11,7 +11,6 @@ #include "content/browser/download/download_file_manager.h" #include "content/browser/download/save_file_manager.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/common/page_transition_types.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_content_browser_client.h" |