Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

content/browser/webui/web_ui.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_WEBUI_WEB_UI_H_
 #define CONTENT_BROWSER_WEBUI_WEB_UI_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/callback_old.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
 #include "ipc/ipc_channel.h"
 
 class GURL;
 class RenderViewHost;
 class TabContents;
 class WebUIMessageHandler;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
@@ skipping 69 matching lines @@
 
   // Gets a custom tab title provided by the Web UI. If there is no title
   // override, the string will be empty which should trigger the default title
   // behavior for the tab.
   const string16& overridden_title() const {
     return overridden_title_;
   }
 
   // Returns the transition type that should be used for link clicks on this
   // Web UI. This will default to LINK but may be overridden.
-  PageTransition::Type link_transition_type() const {
+  content::PageTransition link_transition_type() const {
     return link_transition_type_;
   }
 
   int bindings() const {
     return bindings_;
   }
 
   // Indicates whether RegisterMessageCallback() will overwrite an existing
   // message callback mapping.  Serves as the hook for test mocks.
   bool register_callback_overwrites() const {
@@ skipping 55 matching lines @@
   // Execute a string of raw Javascript on the page.  Overridable for
   // testing purposes.
   virtual void ExecuteJavascript(const string16& javascript);
 
   // Options that may be overridden by individual Web UI implementations. The
   // bool options default to false. See the public getters for more information.
   bool hide_favicon_;
   bool focus_location_bar_by_default_;
   bool should_hide_url_;
   string16 overridden_title_;  // Defaults to empty string.
-  PageTransition::Type link_transition_type_;  // Defaults to LINK.
+  content::PageTransition link_transition_type_;  // Defaults to LINK.
   int bindings_;  // The bindings from BindingsPolicy that should be enabled for
                   // this page.
 
   // Used by test mocks. See the public getters for more information.
   bool register_callback_overwrites_;  // Defaults to false.
 
   // The WebUIMessageHandlers we own.
   std::vector<WebUIMessageHandler*> handlers_;
 
   // Non-owning pointer to the TabContents this WebUI is associated with.
@@ skipping 47 matching lines @@
   // Returns the attached WebUI for this handler.
   WebUI* web_ui() const { return web_ui_; }
 
   WebUI* web_ui_;  // TODO(wyck): Make private after merge conflicts go away.
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler);
 };
 
 #endif  // CONTENT_BROWSER_WEBUI_WEB_UI_H_