From c6e24e396d431af23074ba590acb99d289118c8d Mon Sep 17 00:00:00 2001 From: "mckev@amazon.com" Date: Thu, 27 Mar 2014 17:39:07 +0000 Subject: [PATCH] Fix build when ENABLE_MANAGED_USERS isn't defined In https://codereview.chromium.org/137753012/, (and its associated reverts) ManagedUserSigninManagerWrapper is added to create a bridge between managed users and normally authenticated users. Unfortunately, in builds where enable_managed_users==0 in gyp, the wrapper is excluded from the build due to an exclusion list in chrome_browser.gypi. Therefore, when enable_managed_users==0, libchromeshell fails to build (as well as any other projects that pull in chrome.gyp:chrome). 1) This moves ManagedUserSigninManagerWrapper to chrome/browser/sync because it is the only place this wrapper is used. This also prevents the class from being conditionally excluded due to the rules in chrome_browser.gypi. 2) This commit also adds a missing #ifdef in tab_helpers.cc, which resulted in a compilation error (unused variable 'profile') if ENABLE_MANAGED_USERS is not defined. BUG=352733 Review URL: https://codereview.chromium.org/200573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259928 0039d316-1c4b-4281-b951-d872f2087c98 --- .../{managed_mode => sync}/managed_user_signin_manager_wrapper.cc | 2 +- .../{managed_mode => sync}/managed_user_signin_manager_wrapper.h | 6 +++--- chrome/browser/sync/profile_sync_service.cc | 2 +- chrome/browser/sync/profile_sync_service_factory.cc | 2 +- chrome/browser/sync/profile_sync_service_mock.cc | 2 +- chrome/browser/sync/profile_sync_service_startup_unittest.cc | 2 +- chrome/browser/sync/profile_sync_service_unittest.cc | 2 +- chrome/browser/sync/startup_controller.cc | 2 +- chrome/browser/sync/startup_controller_unittest.cc | 2 +- chrome/browser/sync/test_profile_sync_service.cc | 2 +- chrome/browser/ui/tab_helpers.cc | 5 ++--- chrome/chrome_browser.gypi | 4 ++-- 12 files changed, 16 insertions(+), 17 deletions(-) rename chrome/browser/{managed_mode => sync}/managed_user_signin_manager_wrapper.cc (94%) rename chrome/browser/{managed_mode => sync}/managed_user_signin_manager_wrapper.h (82%) diff --git a/chrome/browser/managed_mode/managed_user_signin_manager_wrapper.cc b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc similarity index 94% rename from chrome/browser/managed_mode/managed_user_signin_manager_wrapper.cc rename to chrome/browser/sync/managed_user_signin_manager_wrapper.cc index c1e242601ebb..5fa2e1737c7d 100644 --- a/chrome/browser/managed_mode/managed_user_signin_manager_wrapper.cc +++ b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/profiles/profile.h" #include "components/signin/core/browser/signin_manager_base.h" diff --git a/chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h b/chrome/browser/sync/managed_user_signin_manager_wrapper.h similarity index 82% rename from chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h rename to chrome/browser/sync/managed_user_signin_manager_wrapper.h index dc85785eda35..507754d3ebe9 100644 --- a/chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h +++ b/chrome/browser/sync/managed_user_signin_manager_wrapper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ -#define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ +#ifndef CHROME_BROWSER_SYNC_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ +#define CHROME_BROWSER_SYNC_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ #include @@ -34,4 +34,4 @@ class ManagedUserSigninManagerWrapper { DISALLOW_COPY_AND_ASSIGN(ManagedUserSigninManagerWrapper); }; -#endif // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ +#endif // CHROME_BROWSER_SYNC_MANAGED_USER_SIGNIN_MANAGER_WRAPPER_H_ diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 52aeb7ec24b8..ce3c016cf102 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -26,7 +26,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/profiles/profile.h" @@ -49,6 +48,7 @@ #include "chrome/browser/sync/glue/sync_start_util.h" #include "chrome/browser/sync/glue/synced_device_tracker.h" #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" #include "chrome/browser/sync/sessions2/notification_service_sessions_router.h" #include "chrome/browser/sync/sessions2/sessions_sync_manager.h" diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index cf7583ae58ac..76b6b5d24fb7 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -12,7 +12,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/invalidation/invalidation_service_factory.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -23,6 +22,7 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/startup_controller.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index 8ed131bf680c..1cfef8e291ff 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -4,10 +4,10 @@ #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_store.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 50467575de9e..ecc49e886d9b 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -5,7 +5,6 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/fake_signin_manager.h" @@ -13,6 +12,7 @@ #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/glue/sync_backend_host_mock.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_test_util.h" diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 490d6a9ea807..11d4ebf389a5 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/browser/invalidation/fake_invalidation_service.h" #include "chrome/browser/invalidation/invalidation_service_factory.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -17,6 +16,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/glue/data_type_manager_impl.h" #include "chrome/browser/sync/glue/sync_backend_host_mock.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" diff --git a/chrome/browser/sync/startup_controller.cc b/chrome/browser/sync/startup_controller.cc index 9479b36f36fc..ca0fb445dbed 100644 --- a/chrome/browser/sync/startup_controller.cc +++ b/chrome/browser/sync/startup_controller.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/common/chrome_switches.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/sync_driver/sync_prefs.h" diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc index 68f633050a83..fc9679096132 100644 --- a/chrome/browser/sync/startup_controller_unittest.cc +++ b/chrome/browser/sync/startup_controller_unittest.cc @@ -9,10 +9,10 @@ #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" #include "components/sync_driver/sync_prefs.h" diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc index 434e7725b0b1..58f8164ed977 100644 --- a/chrome/browser/sync/test_profile_sync_service.cc +++ b/chrome/browser/sync/test_profile_sync_service.cc @@ -5,13 +5,13 @@ #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/glue/sync_backend_host.h" #include "chrome/browser/sync/glue/sync_backend_host_core.h" +#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index fc586cf344ec..5fd4fefe760f 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -109,9 +109,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // Create all the tab helpers. - Profile* profile = - Profile::FromBrowserContext(web_contents->GetBrowserContext()); - // SessionTabHelper comes first because it sets up the tab ID, and other // helpers may rely on that. SessionTabHelper::CreateForWebContents(web_contents); @@ -183,6 +180,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { #endif #if defined(ENABLE_MANAGED_USERS) + Profile* profile = + Profile::FromBrowserContext(web_contents->GetBrowserContext()); if (profile->IsManaged()) { ManagedModeNavigationObserver::CreateForWebContents(web_contents); } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index fd91384cfaca..816722b6e286 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1115,8 +1115,6 @@ 'browser/managed_mode/managed_user_shared_settings_service_factory.h', 'browser/managed_mode/managed_user_shared_settings_update.cc', 'browser/managed_mode/managed_user_shared_settings_update.h', - 'browser/managed_mode/managed_user_signin_manager_wrapper.cc', - 'browser/managed_mode/managed_user_signin_manager_wrapper.h', 'browser/managed_mode/managed_user_sync_service.cc', 'browser/managed_mode/managed_user_sync_service.h', 'browser/managed_mode/managed_user_sync_service_factory.cc', @@ -2351,6 +2349,8 @@ 'browser/sync/glue/ui_data_type_controller.h', 'browser/sync/glue/ui_model_worker.cc', 'browser/sync/glue/ui_model_worker.h', + 'browser/sync/managed_user_signin_manager_wrapper.cc', + 'browser/sync/managed_user_signin_manager_wrapper.h', 'browser/sync/profile_sync_components_factory.h', 'browser/sync/profile_sync_components_factory_impl.cc', 'browser/sync/profile_sync_components_factory_impl.h', -- 2.11.4.GIT