| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #include "app/l10n_util.h" |
| 7 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 8 #include "base/idle_timer.h" | 9 #include "base/idle_timer.h" |
| 9 #include "base/logging.h" | 10 #include "base/logging.h" |
| 10 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 11 #include "base/thread.h" | 12 #include "base/thread.h" |
| 12 #include "chrome/app/chrome_dll_resource.h" | 13 #include "chrome/app/chrome_dll_resource.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_model.h" | 14 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 14 #include "chrome/browser/browser_list.h" | 15 #include "chrome/browser/browser_list.h" |
| 15 #include "chrome/browser/browser_shutdown.h" | 16 #include "chrome/browser/browser_shutdown.h" |
| 16 #include "chrome/browser/browser_window.h" | 17 #include "chrome/browser/browser_window.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/sessions/tab_restore_service.h" | 29 #include "chrome/browser/sessions/tab_restore_service.h" |
| 29 #include "chrome/browser/status_bubble.h" | 30 #include "chrome/browser/status_bubble.h" |
| 30 #include "chrome/browser/tab_contents/interstitial_page.h" | 31 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 31 #include "chrome/browser/tab_contents/navigation_controller.h" | 32 #include "chrome/browser/tab_contents/navigation_controller.h" |
| 32 #include "chrome/browser/tab_contents/navigation_entry.h" | 33 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 33 #include "chrome/browser/tab_contents/site_instance.h" | 34 #include "chrome/browser/tab_contents/site_instance.h" |
| 34 #include "chrome/browser/tab_contents/tab_contents.h" | 35 #include "chrome/browser/tab_contents/tab_contents.h" |
| 35 #include "chrome/browser/tab_contents/tab_contents_view.h" | 36 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 36 #include "chrome/common/chrome_constants.h" | 37 #include "chrome/common/chrome_constants.h" |
| 37 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
| 38 #include "chrome/common/l10n_util.h" | |
| 39 #include "chrome/common/notification_service.h" | 39 #include "chrome/common/notification_service.h" |
| 40 #include "chrome/common/page_transition_types.h" | 40 #include "chrome/common/page_transition_types.h" |
| 41 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
| 42 #include "chrome/common/pref_service.h" | 42 #include "chrome/common/pref_service.h" |
| 43 #include "chrome/common/url_constants.h" | 43 #include "chrome/common/url_constants.h" |
| 44 #ifdef CHROME_PERSONALIZATION | 44 #ifdef CHROME_PERSONALIZATION |
| 45 #include "chrome/personalization/personalization.h" | 45 #include "chrome/personalization/personalization.h" |
| 46 #endif | 46 #endif |
| 47 #include "grit/chromium_strings.h" | 47 #include "grit/chromium_strings.h" |
| 48 #include "grit/generated_resources.h" | 48 #include "grit/generated_resources.h" |
| (...skipping 2585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2634 | 2634 |
| 2635 // We need to register the window position pref. | 2635 // We need to register the window position pref. |
| 2636 std::wstring window_pref(prefs::kBrowserWindowPlacement); | 2636 std::wstring window_pref(prefs::kBrowserWindowPlacement); |
| 2637 window_pref.append(L"_"); | 2637 window_pref.append(L"_"); |
| 2638 window_pref.append(app_name); | 2638 window_pref.append(app_name); |
| 2639 PrefService* prefs = g_browser_process->local_state(); | 2639 PrefService* prefs = g_browser_process->local_state(); |
| 2640 DCHECK(prefs); | 2640 DCHECK(prefs); |
| 2641 | 2641 |
| 2642 prefs->RegisterDictionaryPref(window_pref.c_str()); | 2642 prefs->RegisterDictionaryPref(window_pref.c_str()); |
| 2643 } | 2643 } |
| OLD | NEW |