| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser.h" | 5 #include "chrome/browser/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "chrome/browser/google/google_url_tracker.h" | 55 #include "chrome/browser/google/google_url_tracker.h" |
| 56 #include "chrome/browser/google/google_util.h" | 56 #include "chrome/browser/google/google_util.h" |
| 57 #include "chrome/browser/host_zoom_map.h" | 57 #include "chrome/browser/host_zoom_map.h" |
| 58 #include "chrome/browser/location_bar.h" | 58 #include "chrome/browser/location_bar.h" |
| 59 #include "chrome/browser/metrics/user_metrics.h" | 59 #include "chrome/browser/metrics/user_metrics.h" |
| 60 #include "chrome/browser/net/browser_url_util.h" | 60 #include "chrome/browser/net/browser_url_util.h" |
| 61 #include "chrome/browser/net/url_fixer_upper.h" | 61 #include "chrome/browser/net/url_fixer_upper.h" |
| 62 #include "chrome/browser/options_window.h" | 62 #include "chrome/browser/options_window.h" |
| 63 #include "chrome/browser/platform_util.h" | 63 #include "chrome/browser/platform_util.h" |
| 64 #include "chrome/browser/prefs/pref_service.h" | 64 #include "chrome/browser/prefs/pref_service.h" |
| 65 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" |
| 65 #include "chrome/browser/profile.h" | 66 #include "chrome/browser/profile.h" |
| 66 #include "chrome/browser/renderer_host/render_view_host.h" | 67 #include "chrome/browser/renderer_host/render_view_host.h" |
| 67 #include "chrome/browser/renderer_host/site_instance.h" | 68 #include "chrome/browser/renderer_host/site_instance.h" |
| 68 #include "chrome/browser/service/service_process_control_manager.h" | 69 #include "chrome/browser/service/service_process_control_manager.h" |
| 69 #include "chrome/browser/sessions/session_service.h" | 70 #include "chrome/browser/sessions/session_service.h" |
| 70 #include "chrome/browser/sessions/session_types.h" | 71 #include "chrome/browser/sessions/session_types.h" |
| 71 #include "chrome/browser/sessions/tab_restore_service.h" | 72 #include "chrome/browser/sessions/tab_restore_service.h" |
| 72 #include "chrome/browser/status_bubble.h" | 73 #include "chrome/browser/status_bubble.h" |
| 73 #include "chrome/browser/sync/profile_sync_service.h" | 74 #include "chrome/browser/sync/profile_sync_service.h" |
| 74 #include "chrome/browser/sync/sync_ui_util.h" | 75 #include "chrome/browser/sync/sync_ui_util.h" |
| (...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1924 profile_); | 1925 profile_); |
| 1925 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1926 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 1926 switches::kEnableTabbedOptions)) { | 1927 switches::kEnableTabbedOptions)) { |
| 1927 ShowOptionsTab(chrome::kLanguageOptionsSubPage); | 1928 ShowOptionsTab(chrome::kLanguageOptionsSubPage); |
| 1928 } else { | 1929 } else { |
| 1929 chromeos::LanguageConfigView::Show(profile_, NULL); | 1930 chromeos::LanguageConfigView::Show(profile_, NULL); |
| 1930 } | 1931 } |
| 1931 } | 1932 } |
| 1932 #endif | 1933 #endif |
| 1933 | 1934 |
| 1935 void Browser::OpenCloudPrintProxySetupDialog() { |
| 1936 CloudPrintSetupFlow::OpenDialog(profile_); |
| 1937 } |
| 1938 |
| 1934 /////////////////////////////////////////////////////////////////////////////// | 1939 /////////////////////////////////////////////////////////////////////////////// |
| 1935 | 1940 |
| 1936 // static | 1941 // static |
| 1937 void Browser::SetNewHomePagePrefs(PrefService* prefs) { | 1942 void Browser::SetNewHomePagePrefs(PrefService* prefs) { |
| 1938 const PrefService::Preference* home_page_pref = | 1943 const PrefService::Preference* home_page_pref = |
| 1939 prefs->FindPreference(prefs::kHomePage); | 1944 prefs->FindPreference(prefs::kHomePage); |
| 1940 if (home_page_pref && | 1945 if (home_page_pref && |
| 1941 !home_page_pref->IsManaged() && | 1946 !home_page_pref->IsManaged() && |
| 1942 !prefs->HasPrefPath(prefs::kHomePage)) { | 1947 !prefs->HasPrefPath(prefs::kHomePage)) { |
| 1943 prefs->SetString(prefs::kHomePage, | 1948 prefs->SetString(prefs::kHomePage, |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); | 1993 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); |
| 1989 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); | 1994 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); |
| 1990 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); | 1995 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); |
| 1991 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 1996 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
| 1992 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 1997 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
| 1993 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 1998 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
| 1994 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 1999 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
| 1995 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2000 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
| 1996 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2001 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
| 1997 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2002 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
| 2003 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
| 1998 } | 2004 } |
| 1999 | 2005 |
| 2000 // static | 2006 // static |
| 2001 Browser* Browser::GetBrowserForController( | 2007 Browser* Browser::GetBrowserForController( |
| 2002 const NavigationController* controller, int* index_result) { | 2008 const NavigationController* controller, int* index_result) { |
| 2003 BrowserList::const_iterator it; | 2009 BrowserList::const_iterator it; |
| 2004 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) { | 2010 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) { |
| 2005 int index = (*it)->tabstrip_model_->GetIndexOfController(controller); | 2011 int index = (*it)->tabstrip_model_->GetIndexOfController(controller); |
| 2006 if (index != TabStripModel::kNoTab) { | 2012 if (index != TabStripModel::kNoTab) { |
| 2007 if (index_result) | 2013 if (index_result) |
| (...skipping 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4079 } | 4085 } |
| 4080 | 4086 |
| 4081 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) { | 4087 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) { |
| 4082 if (!tab_restore_service_) | 4088 if (!tab_restore_service_) |
| 4083 return; | 4089 return; |
| 4084 | 4090 |
| 4085 DCHECK_EQ(tab_restore_service_, service); | 4091 DCHECK_EQ(tab_restore_service_, service); |
| 4086 tab_restore_service_->RemoveObserver(this); | 4092 tab_restore_service_->RemoveObserver(this); |
| 4087 tab_restore_service_ = NULL; | 4093 tab_restore_service_ = NULL; |
| 4088 } | 4094 } |
| OLD | NEW |