| 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/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 #include "content/browser/download/save_package.h" | 123 #include "content/browser/download/save_package.h" |
| 124 #include "content/browser/host_zoom_map.h" | 124 #include "content/browser/host_zoom_map.h" |
| 125 #include "content/browser/renderer_host/render_view_host.h" | 125 #include "content/browser/renderer_host/render_view_host.h" |
| 126 #include "content/browser/site_instance.h" | 126 #include "content/browser/site_instance.h" |
| 127 #include "content/browser/tab_contents/interstitial_page.h" | 127 #include "content/browser/tab_contents/interstitial_page.h" |
| 128 #include "content/browser/tab_contents/navigation_controller.h" | 128 #include "content/browser/tab_contents/navigation_controller.h" |
| 129 #include "content/browser/tab_contents/navigation_entry.h" | 129 #include "content/browser/tab_contents/navigation_entry.h" |
| 130 #include "content/browser/tab_contents/tab_contents_view.h" | 130 #include "content/browser/tab_contents/tab_contents_view.h" |
| 131 #include "content/browser/user_metrics.h" | 131 #include "content/browser/user_metrics.h" |
| 132 #include "content/common/content_restriction.h" | 132 #include "content/common/content_restriction.h" |
| 133 #include "content/common/content_switches.h" |
| 133 #include "content/common/notification_service.h" | 134 #include "content/common/notification_service.h" |
| 134 #include "content/common/page_transition_types.h" | 135 #include "content/common/page_transition_types.h" |
| 135 #include "content/common/page_zoom.h" | 136 #include "content/common/page_zoom.h" |
| 136 #include "content/common/view_messages.h" | 137 #include "content/common/view_messages.h" |
| 137 #include "grit/chromium_strings.h" | 138 #include "grit/chromium_strings.h" |
| 138 #include "grit/generated_resources.h" | 139 #include "grit/generated_resources.h" |
| 139 #include "grit/locale_settings.h" | 140 #include "grit/locale_settings.h" |
| 140 #include "net/base/cookie_monster.h" | 141 #include "net/base/cookie_monster.h" |
| 141 #include "net/base/net_util.h" | 142 #include "net/base/net_util.h" |
| 142 #include "net/base/registry_controlled_domain.h" | 143 #include "net/base/registry_controlled_domain.h" |
| (...skipping 4981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5124 } | 5125 } |
| 5125 | 5126 |
| 5126 void Browser::ShowSyncSetup() { | 5127 void Browser::ShowSyncSetup() { |
| 5127 ProfileSyncService* service = | 5128 ProfileSyncService* service = |
| 5128 profile()->GetOriginalProfile()->GetProfileSyncService(); | 5129 profile()->GetOriginalProfile()->GetProfileSyncService(); |
| 5129 if (service->HasSyncSetupCompleted()) | 5130 if (service->HasSyncSetupCompleted()) |
| 5130 ShowOptionsTab(chrome::kSyncSetupSubPage); | 5131 ShowOptionsTab(chrome::kSyncSetupSubPage); |
| 5131 else | 5132 else |
| 5132 service->ShowLoginDialog(); | 5133 service->ShowLoginDialog(); |
| 5133 } | 5134 } |
| OLD | NEW |