| 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 13 matching lines...) Expand all Loading... |
| 24 #include "base/utf_string_conversions.h" | 24 #include "base/utf_string_conversions.h" |
| 25 #include "chrome/app/chrome_command_ids.h" | 25 #include "chrome/app/chrome_command_ids.h" |
| 26 #include "chrome/browser/autofill/autofill_manager.h" | 26 #include "chrome/browser/autofill/autofill_manager.h" |
| 27 #include "chrome/browser/background/background_contents_service.h" | 27 #include "chrome/browser/background/background_contents_service.h" |
| 28 #include "chrome/browser/bookmarks/bookmark_model.h" | 28 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 29 #include "chrome/browser/bookmarks/bookmark_utils.h" | 29 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 30 #include "chrome/browser/browser_process.h" | 30 #include "chrome/browser/browser_process.h" |
| 31 #include "chrome/browser/browser_shutdown.h" | 31 #include "chrome/browser/browser_shutdown.h" |
| 32 #include "chrome/browser/browser_url_handler.h" | 32 #include "chrome/browser/browser_url_handler.h" |
| 33 #include "chrome/browser/character_encoding.h" | 33 #include "chrome/browser/character_encoding.h" |
| 34 #include "chrome/browser/debugger/devtools_manager.h" | |
| 35 #include "chrome/browser/debugger/devtools_toggle_action.h" | |
| 36 #include "chrome/browser/debugger/devtools_window.h" | |
| 37 #include "chrome/browser/download/download_item.h" | 34 #include "chrome/browser/download/download_item.h" |
| 38 #include "chrome/browser/download/download_item_model.h" | 35 #include "chrome/browser/download/download_item_model.h" |
| 39 #include "chrome/browser/download/download_manager.h" | 36 #include "chrome/browser/download/download_manager.h" |
| 40 #include "chrome/browser/download/download_shelf.h" | 37 #include "chrome/browser/download/download_shelf.h" |
| 41 #include "chrome/browser/download/download_started_animation.h" | 38 #include "chrome/browser/download/download_started_animation.h" |
| 42 #include "chrome/browser/download/save_package.h" | 39 #include "chrome/browser/download/save_package.h" |
| 43 #include "chrome/browser/extensions/crx_installer.h" | 40 #include "chrome/browser/extensions/crx_installer.h" |
| 44 #include "chrome/browser/extensions/extension_browser_event_router.h" | 41 #include "chrome/browser/extensions/extension_browser_event_router.h" |
| 45 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" | 42 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" |
| 46 #include "chrome/browser/extensions/extension_host.h" | 43 #include "chrome/browser/extensions/extension_host.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 #include "chrome/browser/upgrade_detector.h" | 101 #include "chrome/browser/upgrade_detector.h" |
| 105 #include "chrome/browser/web_applications/web_app.h" | 102 #include "chrome/browser/web_applications/web_app.h" |
| 106 #include "chrome/common/chrome_constants.h" | 103 #include "chrome/common/chrome_constants.h" |
| 107 #include "chrome/common/chrome_switches.h" | 104 #include "chrome/common/chrome_switches.h" |
| 108 #include "chrome/common/extensions/extension.h" | 105 #include "chrome/common/extensions/extension.h" |
| 109 #include "chrome/common/extensions/extension_constants.h" | 106 #include "chrome/common/extensions/extension_constants.h" |
| 110 #include "chrome/common/pref_names.h" | 107 #include "chrome/common/pref_names.h" |
| 111 #include "chrome/common/profiling.h" | 108 #include "chrome/common/profiling.h" |
| 112 #include "chrome/common/url_constants.h" | 109 #include "chrome/common/url_constants.h" |
| 113 #include "chrome/common/web_apps.h" | 110 #include "chrome/common/web_apps.h" |
| 111 #include "content/browser/debugger/devtools_manager.h" |
| 112 #include "content/browser/debugger/devtools_toggle_action.h" |
| 113 #include "content/browser/debugger/devtools_window.h" |
| 114 #include "content/browser/host_zoom_map.h" | 114 #include "content/browser/host_zoom_map.h" |
| 115 #include "content/browser/renderer_host/render_view_host.h" | 115 #include "content/browser/renderer_host/render_view_host.h" |
| 116 #include "content/browser/site_instance.h" | 116 #include "content/browser/site_instance.h" |
| 117 #include "content/browser/tab_contents/interstitial_page.h" | 117 #include "content/browser/tab_contents/interstitial_page.h" |
| 118 #include "content/browser/tab_contents/navigation_controller.h" | 118 #include "content/browser/tab_contents/navigation_controller.h" |
| 119 #include "content/browser/tab_contents/navigation_entry.h" | 119 #include "content/browser/tab_contents/navigation_entry.h" |
| 120 #include "content/browser/tab_contents/tab_contents_view.h" | 120 #include "content/browser/tab_contents/tab_contents_view.h" |
| 121 #include "content/browser/user_metrics.h" | 121 #include "content/browser/user_metrics.h" |
| 122 #include "content/common/content_restriction.h" | 122 #include "content/common/content_restriction.h" |
| 123 #include "content/common/notification_service.h" | 123 #include "content/common/notification_service.h" |
| (...skipping 4602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4726 // end up querying state once they process the tab switch. | 4726 // end up querying state once they process the tab switch. |
| 4727 return; | 4727 return; |
| 4728 } | 4728 } |
| 4729 | 4729 |
| 4730 BookmarkBar::AnimateChangeType animate_type = | 4730 BookmarkBar::AnimateChangeType animate_type = |
| 4731 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? | 4731 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? |
| 4732 BookmarkBar::ANIMATE_STATE_CHANGE : | 4732 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 4733 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; | 4733 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; |
| 4734 window_->BookmarkBarStateChanged(animate_type); | 4734 window_->BookmarkBarStateChanged(animate_type); |
| 4735 } | 4735 } |
| OLD | NEW |