diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:32:59 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:32:59 +0000 |
| commit | 93270d001be703684c1c1bd1e28be7e553a19c99 (patch) | |
| tree | 4161c4c8fdef06ab6b9e0252134eb1a83e94777a /chrome/browser/profiles/profile_impl.cc | |
| parent | af463aeaf8ab763f9afdf7193a52238f9bb18fc7 (diff) | |
| download | chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.zip chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.tar.gz chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.tar.bz2 | |
Update references part 3: remaining files in chrome/...
Update chrome/browser/gtk references & copyright dates of touched files.
Re-alphabetize include lists as necessary from this change.
Manually merge r71828
svn pset svn:eol-style LF \
chrome/browser/automation/testing_automation_provider_gtk.cc \
chrome/browser/speech/speech_input_bubble_gtk.cc
BUG=69289
TEST=none
Review URL: http://codereview.chromium.org/6245006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_impl.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index e4495e3..b235eb1 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -32,8 +32,8 @@ #include "chrome/browser/extensions/default_apps.h" #include "chrome/browser/extensions/extension_devtools_manager.h" #include "chrome/browser/extensions/extension_error_reporter.h" -#include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/extension_event_router.h" +#include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_process_manager.h" @@ -46,8 +46,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/host_zoom_map.h" -#include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/in_process_webkit/webkit_context.h" +#include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/net/net_pref_observer.h" @@ -55,8 +55,8 @@ #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/password_manager/password_store_default.h" -#include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" +#include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/policy/profile_policy_context.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_value_store.h" @@ -96,7 +96,7 @@ #include "webkit/database/database_tracker.h" #if defined(TOOLKIT_USES_GTK) -#include "chrome/browser/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" #endif #if defined(OS_WIN) |