| 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/automation/automation_provider.h" | 5 #include "chrome/browser/automation/automation_provider.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/message_box_flags.h" | 8 #include "app/message_box_flags.h" |
| 9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
| 10 #include "base/json_reader.h" | 10 #include "base/json_reader.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 #include "net/proxy/proxy_config_service_fixed.h" | 53 #include "net/proxy/proxy_config_service_fixed.h" |
| 54 #include "net/url_request/url_request_context.h" | 54 #include "net/url_request/url_request_context.h" |
| 55 #include "net/url_request/url_request_filter.h" | 55 #include "net/url_request/url_request_filter.h" |
| 56 | 56 |
| 57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
| 58 // TODO(port): Port these headers. | 58 // TODO(port): Port these headers. |
| 59 #include "chrome/browser/automation/ui_controls.h" | 59 #include "chrome/browser/automation/ui_controls.h" |
| 60 #include "chrome/browser/character_encoding.h" | 60 #include "chrome/browser/character_encoding.h" |
| 61 #include "chrome/browser/download/save_package.h" | 61 #include "chrome/browser/download/save_package.h" |
| 62 #include "chrome/browser/external_tab_container.h" | 62 #include "chrome/browser/external_tab_container.h" |
| 63 #include "chrome/browser/login_prompt.h" | |
| 64 #include "chrome/browser/printing/print_job.h" | 63 #include "chrome/browser/printing/print_job.h" |
| 65 #endif // defined(OS_WIN) | 64 #endif // defined(OS_WIN) |
| 66 | 65 |
| 66 #if defined(OS_WIN) || defined(OS_LINUX) |
| 67 // TODO(port): Port these to the mac. |
| 68 #include "chrome/browser/login_prompt.h" |
| 69 #endif |
| 70 |
| 67 #if defined(OS_WIN) | 71 #if defined(OS_WIN) |
| 68 #include "chrome/browser/views/bookmark_bar_view.h" | 72 #include "chrome/browser/views/bookmark_bar_view.h" |
| 69 #include "views/widget/root_view.h" | 73 #include "views/widget/root_view.h" |
| 70 #include "views/widget/widget_win.h" | 74 #include "views/widget/widget_win.h" |
| 71 #include "views/window/window.h" | 75 #include "views/window/window.h" |
| 72 #endif | 76 #endif |
| 73 | 77 |
| 74 using base::Time; | 78 using base::Time; |
| 75 | 79 |
| 76 class InitialLoadObserver : public NotificationObserver { | 80 class InitialLoadObserver : public NotificationObserver { |
| (...skipping 2961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3038 if (container) { | 3042 if (container) { |
| 3039 *count = static_cast<int>(container->GetBlockedPopupCount()); | 3043 *count = static_cast<int>(container->GetBlockedPopupCount()); |
| 3040 } else { | 3044 } else { |
| 3041 // If we don't have a container, we don't have any blocked popups to | 3045 // If we don't have a container, we don't have any blocked popups to |
| 3042 // contain! | 3046 // contain! |
| 3043 *count = 0; | 3047 *count = 0; |
| 3044 } | 3048 } |
| 3045 } | 3049 } |
| 3046 } | 3050 } |
| 3047 } | 3051 } |
| OLD | NEW |