| 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/ui/browser.h" | 5 #include "chrome/browser/ui/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 |
| 11 | 11 |
| 12 #include <algorithm> | 12 #include <algorithm> |
| 13 #include <string> | 13 #include <string> |
| 14 | 14 |
| 15 #include "app/animation.h" | 15 #include "app/animation.h" |
| 16 #include "app/l10n_util.h" | 16 #include "app/l10n_util.h" |
| 17 #include "base/base_paths.h" | 17 #include "base/base_paths.h" |
| 18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| 20 #include "base/metrics/histogram.h" | 20 #include "base/metrics/histogram.h" |
| 21 #include "base/path_service.h" | 21 #include "base/path_service.h" |
| 22 #include "base/string_util.h" | 22 #include "base/string_util.h" |
| 23 #include "base/thread.h" | 23 #include "base/threading/thread.h" |
| 24 #include "base/thread_restrictions.h" | 24 #include "base/threading/thread_restrictions.h" |
| 25 #include "base/utf_string_conversions.h" | 25 #include "base/utf_string_conversions.h" |
| 26 #include "gfx/point.h" | 26 #include "gfx/point.h" |
| 27 #include "chrome/app/chrome_command_ids.h" | 27 #include "chrome/app/chrome_command_ids.h" |
| 28 #include "chrome/browser/autofill/autofill_manager.h" | 28 #include "chrome/browser/autofill/autofill_manager.h" |
| 29 #include "chrome/browser/bookmarks/bookmark_model.h" | 29 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 30 #include "chrome/browser/bookmarks/bookmark_utils.h" | 30 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 31 #include "chrome/browser/browser_list.h" | 31 #include "chrome/browser/browser_list.h" |
| 32 #include "chrome/browser/browser_process.h" | 32 #include "chrome/browser/browser_process.h" |
| 33 #include "chrome/browser/browser_shutdown.h" | 33 #include "chrome/browser/browser_shutdown.h" |
| 34 #include "chrome/browser/browser_window.h" | 34 #include "chrome/browser/browser_window.h" |
| (...skipping 4213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4248 // The page transition below is only for the purpose of inserting the tab. | 4248 // The page transition below is only for the purpose of inserting the tab. |
| 4249 browser->AddTab(view_source_contents, PageTransition::LINK); | 4249 browser->AddTab(view_source_contents, PageTransition::LINK); |
| 4250 } | 4250 } |
| 4251 | 4251 |
| 4252 if (profile_->HasSessionService()) { | 4252 if (profile_->HasSessionService()) { |
| 4253 SessionService* session_service = profile_->GetSessionService(); | 4253 SessionService* session_service = profile_->GetSessionService(); |
| 4254 if (session_service) | 4254 if (session_service) |
| 4255 session_service->TabRestored(&view_source_contents->controller(), false); | 4255 session_service->TabRestored(&view_source_contents->controller(), false); |
| 4256 } | 4256 } |
| 4257 } | 4257 } |
| OLD | NEW |