diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 20:01:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 20:01:40 +0000 |
| commit | 79fe227571a36a13128546564e542a742ebb8523 (patch) | |
| tree | f712e2e984db2e8f02da51662a148085fffc6ee2 /chrome_frame | |
| parent | aeda9d98cc0893bbaed8f0d774d1f19a15f55e2a (diff) | |
| download | chromium_src-79fe227571a36a13128546564e542a742ebb8523.zip chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.gz chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.bz2 | |
Migrate from googleurl/ includes to url/ ones in the remaining top-level directories.
BUG=229660
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/18919005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/navigation_constraints.h | 2 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/utils.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 59212c3..b99ba0b 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -27,7 +27,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome_frame/utils.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace { diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 177b9ac..8728c95 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -42,8 +42,8 @@ #include "chrome_frame/pin_module.h" #include "chrome_frame/resource.h" #include "chrome_frame/utils.h" -#include "googleurl/src/url_util.h" #include "grit/chrome_frame_resources.h" +#include "url/url_util.h" using base::win::RegKey; diff --git a/chrome_frame/navigation_constraints.h b/chrome_frame/navigation_constraints.h index 2aefe5c..5ddaf4c 100644 --- a/chrome_frame/navigation_constraints.h +++ b/chrome_frame/navigation_constraints.h @@ -9,7 +9,7 @@ #include <windows.h> #include "base/win/scoped_comptr.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // Provides an interface which controls navigation within ChromeFrame. class NavigationConstraints { diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 7843961..149d721 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -37,12 +37,12 @@ #include "chrome_frame/registry_list_preferences_holder.h" #include "chrome_frame/simple_resource_loader.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" -#include "googleurl/src/url_canon.h" #include "grit/chromium_strings.h" #include "net/base/escape.h" #include "net/http/http_util.h" #include "ui/base/models/menu_model.h" +#include "url/gurl.h" +#include "url/url_canon.h" using base::win::RegKey; diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index 8520c7b..d0ee2fd 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -17,8 +17,8 @@ #include "base/metrics/histogram.h" #include "base/strings/string16.h" #include "base/win/scoped_comptr.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" class RegistryListPreferencesHolder; interface IBrowserService; |