summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/api/tabs/tabs_api.cc2
-rw-r--r--chrome/browser/resources/translate_internals/translate_internals.js4
-rw-r--r--chrome/browser/translate/page_translated_details.h2
-rw-r--r--chrome/browser/translate/translate_error_details.h2
-rw-r--r--chrome/browser/translate/translate_infobar_delegate.h2
-rw-r--r--chrome/browser/translate/translate_manager.cc3
-rw-r--r--chrome/browser/translate/translate_manager.h2
-rw-r--r--chrome/browser/translate/translate_manager_browsertest.cc2
-rw-r--r--chrome/browser/translate/translate_tab_helper.cc2
-rw-r--r--chrome/browser/translate/translate_tab_helper.h2
-rw-r--r--chrome/browser/ui/browser_browsertest.cc2
-rw-r--r--chrome/browser/ui/cocoa/infobars/translate_infobar_base.h2
-rw-r--r--chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc2
13 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 288d2cf..66b4c77 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -62,8 +62,8 @@
#include "chrome/common/extensions/message_bundle.h"
#include "chrome/common/extensions/permissions/permissions_data.h"
#include "chrome/common/extensions/user_script.h"
-#include "chrome/common/language_detection_details.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "chrome/common/url_constants.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/navigation_controller.h"
diff --git a/chrome/browser/resources/translate_internals/translate_internals.js b/chrome/browser/resources/translate_internals/translate_internals.js
index 9d683d9..df9c5b7 100644
--- a/chrome/browser/resources/translate_internals/translate_internals.js
+++ b/chrome/browser/resources/translate_internals/translate_internals.js
@@ -75,8 +75,8 @@
* @return {string} The formatted string.
*/
function formatTranslateErrorsType(error) {
- // This list is from chrome/common/translate_errors.h. If this header
- // file is updated, the below list also should be updated.
+ // This list is from chrome/common/translate/translate_errors.h.
+ // If this header file is updated, the below list also should be updated.
var errorStrs = {
0: 'None',
1: 'Network',
diff --git a/chrome/browser/translate/page_translated_details.h b/chrome/browser/translate/page_translated_details.h
index 61a43d4..fbf5038 100644
--- a/chrome/browser/translate/page_translated_details.h
+++ b/chrome/browser/translate/page_translated_details.h
@@ -7,7 +7,7 @@
#include <string>
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
// Used when sending a notification about a page that has been translated.
struct PageTranslatedDetails {
diff --git a/chrome/browser/translate/translate_error_details.h b/chrome/browser/translate/translate_error_details.h
index fcd1955..bdd2ecc 100644
--- a/chrome/browser/translate/translate_error_details.h
+++ b/chrome/browser/translate/translate_error_details.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_TRANSLATE_TRANSLATE_ERROR_DETAILS_H_
#include "base/time.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
#include "googleurl/src/gurl.h"
struct TranslateErrorDetails {
diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/chrome/browser/translate/translate_infobar_delegate.h
index 5cecf69..7f8d251 100644
--- a/chrome/browser/translate/translate_infobar_delegate.h
+++ b/chrome/browser/translate/translate_infobar_delegate.h
@@ -14,7 +14,7 @@
#include "chrome/browser/infobars/infobar_delegate.h"
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
class PrefService;
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 26347ac..8e61f6e 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -37,10 +37,9 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/language_detection_details.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_details.h"
diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h
index 88eb9ce..a8137cd 100644
--- a/chrome/browser/translate/translate_manager.h
+++ b/chrome/browser/translate/translate_manager.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/time.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "net/url_request/url_fetcher_delegate.h"
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 2eedcf0..18c904c 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -28,9 +28,9 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/language_detection_details.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/translate/translate_tab_helper.cc b/chrome/browser/translate/translate_tab_helper.cc
index 572a026..b8de0e5 100644
--- a/chrome/browser/translate/translate_tab_helper.cc
+++ b/chrome/browser/translate/translate_tab_helper.cc
@@ -6,8 +6,8 @@
#include "chrome/browser/translate/page_translated_details.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/language_detection_details.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/translate/translate_tab_helper.h b/chrome/browser/translate/translate_tab_helper.h
index 3ee94e9..a69ea5e 100644
--- a/chrome/browser/translate/translate_tab_helper.h
+++ b/chrome/browser/translate/translate_tab_helper.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
#include "chrome/browser/tab_contents/language_state.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 364d620..22baafd 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -48,7 +48,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
-#include "chrome/common/language_detection_details.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
index 5bb423b..31df784 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
@@ -12,7 +12,7 @@
#include "chrome/browser/translate/options_menu_model.h"
#include "chrome/browser/translate/translate_infobar_delegate.h"
#import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
-#include "chrome/common/translate_errors.h"
+#include "chrome/common/translate/translate_errors.h"
// The base class for the three translate infobars. This class does all of the
// heavy UI lifting, while deferring to the subclass to tell it what views
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
index 90af456..1582c37 100644
--- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
+++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
@@ -14,8 +14,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/translate/translate_error_details.h"
#include "chrome/browser/translate/translate_prefs.h"
-#include "chrome/common/language_detection_details.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/translate/language_detection_details.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"