Move LoadNotificationDetails to content/.

BUG=71097
TEST=still builds

Review URL: http://codereview.chromium.org/6966037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86487 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 23 insertions, 15 deletions

diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 1d7e5a9f..89b32a6 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,6 +26,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
+#include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 81974fd..db1e903 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/history_tab_helper.h"
-#include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -35,6 +34,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index ce77ae5..9946ae8 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -169,7 +169,6 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/metrics/metrics_log.h"
@@ -184,6 +183,7 @@
 #include "chrome/common/guid.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
+#include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/child_process_info.h"
 #include "content/common/notification_service.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0965301..61ae563 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1313,7 +1313,6 @@
         'browser/language_order_table_model.h',
         'browser/load_from_memory_cache_details.cc',
         'browser/load_from_memory_cache_details.h',
-        'browser/load_notification_details.h',
         'browser/mach_broker_mac.cc',
         'browser/mach_broker_mac.h',
         'browser/memory_details.cc',
diff --git a/content/browser/DEPS b/content/browser/DEPS
index b20da8e..7abd313 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -37,7 +37,6 @@ include_rules = [
   "+chrome/browser/external_protocol_handler.h",

 

   "+chrome/browser/load_from_memory_cache_details.h",

-  "+chrome/browser/load_notification_details.h",

 

   "+chrome/browser/mach_broker_mac.h",

 

diff --git a/chrome/browser/load_notification_details.h b/content/browser/load_notification_details.h
index 6e96c6e..d3b7ab4 100644
--- a/chrome/browser/load_notification_details.h
+++ b/content/browser/load_notification_details.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,8 +6,8 @@
 // page load that has been completed.  It was created to let the MetricsService
 // log page load metrics.
 
-#ifndef CHROME_BROWSER_LOAD_NOTIFICATION_DETAILS_H__
-#define CHROME_BROWSER_LOAD_NOTIFICATION_DETAILS_H__
+#ifndef CONTENT_BROWSER_LOAD_NOTIFICATION_DETAILS_H_
+#define CONTENT_BROWSER_LOAD_NOTIFICATION_DETAILS_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -38,15 +38,24 @@ class LoadNotificationDetails {
   NavigationController* controller() const { return controller_; }
 
  private:
-  GURL url_;           // the URL loaded
-  base::TimeDelta load_time_;               // length of time the page load took
-  int session_index_;  // index of the load within the tab session
-  PageTransition::Type origin_;       // type of action that caused the load
-  NavigationController* controller_;  // tells us which tab the load was in
+  // The URL loaded.
+  GURL url_;
+
+  // The length of time the page load took.
+  base::TimeDelta load_time_;
+
+  // The index of the load within the tab session.
+  int session_index_;
+
+  // The type of action that caused the load.
+  PageTransition::Type origin_;
+
+  // The NavigationController for the load.
+  NavigationController* controller_;
 
   LoadNotificationDetails() {}
 
   DISALLOW_COPY_AND_ASSIGN(LoadNotificationDetails);
 };
 
-#endif  // CHROME_BROWSER_LOAD_NOTIFICATION_DETAILS_H__
+#endif  // CONTENT_BROWSER_LOAD_NOTIFICATION_DETAILS_H_
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 34365f3..19b36c3 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
-#include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -34,6 +33,7 @@
 #include "content/browser/content_browser_client.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
+#include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 612e744..cf588e3 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -165,6 +165,7 @@
         'browser/in_process_webkit/webkit_context.h',
         'browser/in_process_webkit/webkit_thread.cc',
         'browser/in_process_webkit/webkit_thread.h',
+        'browser/load_notification_details.h',
         'browser/mime_registry_message_filter.cc',
         'browser/mime_registry_message_filter.h',
         'browser/ppapi_plugin_process_host.cc',