| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/dom_ui/options/personal_options_handler.h" | 5 #include "chrome/browser/dom_ui/options/personal_options_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/stl_util-inl.h" | 13 #include "base/stl_util-inl.h" |
| 14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 15 #include "base/values.h" | 15 #include "base/values.h" |
| 16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 17 #include "chrome/browser/browser_list.h" | 17 #include "chrome/browser/browser_list.h" |
| 18 #include "chrome/browser/dom_ui/options/dom_options_util.h" | 18 #include "chrome/browser/dom_ui/options/dom_options_util.h" |
| 19 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" | 19 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" |
| 20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/browser/profiles/profile_manager.h" | 21 #include "chrome/browser/profiles/profile_manager.h" |
| 22 #include "chrome/browser/sync/profile_sync_service.h" | 22 #include "chrome/browser/sync/profile_sync_service.h" |
| 23 #include "chrome/browser/sync/sync_setup_flow.h" | 23 #include "chrome/browser/sync/sync_setup_flow.h" |
| 24 #include "chrome/browser/sync/sync_ui_util.h" | 24 #include "chrome/browser/sync/sync_ui_util.h" |
| 25 #include "chrome/browser/themes/browser_theme_provider.h" | 25 #include "chrome/browser/themes/browser_theme_provider.h" |
| 26 #include "chrome/browser/ui/options/options_page_base.h" | 26 #include "chrome/browser/ui/options/options_page_base.h" |
| 27 #include "chrome/browser/ui/options/options_window.h" | 27 #include "chrome/browser/ui/options/options_window.h" |
| 28 #include "chrome/common/chrome_paths.h" |
| 28 #include "chrome/common/net/gaia/google_service_auth_error.h" | 29 #include "chrome/common/net/gaia/google_service_auth_error.h" |
| 29 #include "chrome/common/notification_service.h" | 30 #include "chrome/common/notification_service.h" |
| 30 #include "chrome/common/chrome_paths.h" | |
| 31 #include "grit/browser_resources.h" | 31 #include "grit/browser_resources.h" |
| 32 #include "grit/chromium_strings.h" | 32 #include "grit/chromium_strings.h" |
| 33 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
| 34 #include "grit/locale_settings.h" | 34 #include "grit/locale_settings.h" |
| 35 #include "grit/theme_resources.h" | 35 #include "grit/theme_resources.h" |
| 36 | 36 |
| 37 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
| 38 #include "chrome/browser/chromeos/login/user_manager.h" | 38 #include "chrome/browser/chromeos/login/user_manager.h" |
| 39 #endif // defined(OS_CHROMEOS) | 39 #endif // defined(OS_CHROMEOS) |
| 40 #if defined(TOOLKIT_GTK) | 40 #if defined(TOOLKIT_GTK) |
| 41 #include "chrome/browser/gtk/gtk_theme_provider.h" | 41 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" |
| 42 #endif // defined(TOOLKIT_GTK) | 42 #endif // defined(TOOLKIT_GTK) |
| 43 | 43 |
| 44 PersonalOptionsHandler::PersonalOptionsHandler() { | 44 PersonalOptionsHandler::PersonalOptionsHandler() { |
| 45 } | 45 } |
| 46 | 46 |
| 47 PersonalOptionsHandler::~PersonalOptionsHandler() { | 47 PersonalOptionsHandler::~PersonalOptionsHandler() { |
| 48 ProfileSyncService* sync_service = | 48 ProfileSyncService* sync_service = |
| 49 dom_ui_->GetProfile()->GetProfileSyncService(); | 49 dom_ui_->GetProfile()->GetProfileSyncService(); |
| 50 if (sync_service) | 50 if (sync_service) |
| 51 sync_service->RemoveObserver(this); | 51 sync_service->RemoveObserver(this); |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 } | 336 } |
| 337 #endif | 337 #endif |
| 338 | 338 |
| 339 void PersonalOptionsHandler::OnPreferredDataTypesUpdated( | 339 void PersonalOptionsHandler::OnPreferredDataTypesUpdated( |
| 340 const ListValue* args) { | 340 const ListValue* args) { |
| 341 NotificationService::current()->Notify( | 341 NotificationService::current()->Notify( |
| 342 NotificationType::SYNC_DATA_TYPES_UPDATED, | 342 NotificationType::SYNC_DATA_TYPES_UPDATED, |
| 343 Source<Profile>(dom_ui_->GetProfile()), | 343 Source<Profile>(dom_ui_->GetProfile()), |
| 344 NotificationService::NoDetails()); | 344 NotificationService::NoDetails()); |
| 345 } | 345 } |
| OLD | NEW |