Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 6598057: Split infobar_delegate.[cc,h] into separate pieces for the different classes defined within, so that (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/browser/platform_util.h" 58 #include "chrome/browser/platform_util.h"
59 #include "chrome/browser/prefs/pref_service.h" 59 #include "chrome/browser/prefs/pref_service.h"
60 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 60 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
61 #include "chrome/browser/profiles/profile.h" 61 #include "chrome/browser/profiles/profile.h"
62 #include "chrome/browser/sessions/session_service.h" 62 #include "chrome/browser/sessions/session_service.h"
63 #include "chrome/browser/sessions/session_types.h" 63 #include "chrome/browser/sessions/session_types.h"
64 #include "chrome/browser/sessions/tab_restore_service.h" 64 #include "chrome/browser/sessions/tab_restore_service.h"
65 #include "chrome/browser/sync/profile_sync_service.h" 65 #include "chrome/browser/sync/profile_sync_service.h"
66 #include "chrome/browser/sync/sync_ui_util.h" 66 #include "chrome/browser/sync/sync_ui_util.h"
67 #include "chrome/browser/tab_closeable_state_watcher.h" 67 #include "chrome/browser/tab_closeable_state_watcher.h"
68 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
68 #include "chrome/browser/tabs/tab_strip_model.h" 69 #include "chrome/browser/tabs/tab_strip_model.h"
69 #include "chrome/browser/ui/find_bar/find_bar.h" 70 #include "chrome/browser/ui/find_bar/find_bar.h"
70 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 71 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
71 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 72 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
72 #include "chrome/browser/ui/omnibox/location_bar.h" 73 #include "chrome/browser/ui/omnibox/location_bar.h"
73 #include "chrome/browser/ui/options/options_window.h" 74 #include "chrome/browser/ui/options/options_window.h"
74 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 75 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
75 #include "chrome/browser/ui/status_bubble.h" 76 #include "chrome/browser/ui/status_bubble.h"
76 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 77 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
77 #include "chrome/browser/ui/tabs/dock_info.h" 78 #include "chrome/browser/ui/tabs/dock_info.h"
(...skipping 11 matching lines...) Expand all
89 #include "chrome/common/extensions/extension_constants.h" 90 #include "chrome/common/extensions/extension_constants.h"
90 #include "chrome/common/notification_service.h" 91 #include "chrome/common/notification_service.h"
91 #include "chrome/common/page_transition_types.h" 92 #include "chrome/common/page_transition_types.h"
92 #include "chrome/common/pref_names.h" 93 #include "chrome/common/pref_names.h"
93 #include "chrome/common/profiling.h" 94 #include "chrome/common/profiling.h"
94 #include "chrome/common/url_constants.h" 95 #include "chrome/common/url_constants.h"
95 #include "chrome/common/web_apps.h" 96 #include "chrome/common/web_apps.h"
96 #include "content/browser/host_zoom_map.h" 97 #include "content/browser/host_zoom_map.h"
97 #include "content/browser/renderer_host/render_view_host.h" 98 #include "content/browser/renderer_host/render_view_host.h"
98 #include "content/browser/site_instance.h" 99 #include "content/browser/site_instance.h"
99 #include "content/browser/tab_contents/infobar_delegate.h" 100 #include "content/browser/tab_contents/infobar_delegate.h"
Peter Kasting 2011/03/01 19:10:37 Nit: Can this disappear?
tfarina 2011/03/02 01:47:13 Removed.
100 #include "content/browser/tab_contents/interstitial_page.h" 101 #include "content/browser/tab_contents/interstitial_page.h"
101 #include "content/browser/tab_contents/navigation_controller.h" 102 #include "content/browser/tab_contents/navigation_controller.h"
102 #include "content/browser/tab_contents/navigation_entry.h" 103 #include "content/browser/tab_contents/navigation_entry.h"
103 #include "content/browser/tab_contents/tab_contents.h" 104 #include "content/browser/tab_contents/tab_contents.h"
104 #include "content/browser/tab_contents/tab_contents_view.h" 105 #include "content/browser/tab_contents/tab_contents_view.h"
105 #include "grit/chromium_strings.h" 106 #include "grit/chromium_strings.h"
106 #include "grit/generated_resources.h" 107 #include "grit/generated_resources.h"
107 #include "grit/locale_settings.h" 108 #include "grit/locale_settings.h"
108 #include "net/base/cookie_monster.h" 109 #include "net/base/cookie_monster.h"
109 #include "net/base/net_util.h" 110 #include "net/base/net_util.h"
(...skipping 4290 matching lines...) Expand 10 before | Expand all | Expand 10 after
4400 // The page transition below is only for the purpose of inserting the tab. 4401 // The page transition below is only for the purpose of inserting the tab.
4401 browser->AddTab(view_source_contents, PageTransition::LINK); 4402 browser->AddTab(view_source_contents, PageTransition::LINK);
4402 } 4403 }
4403 4404
4404 if (profile_->HasSessionService()) { 4405 if (profile_->HasSessionService()) {
4405 SessionService* session_service = profile_->GetSessionService(); 4406 SessionService* session_service = profile_->GetSessionService();
4406 if (session_service) 4407 if (session_service)
4407 session_service->TabRestored(&view_source_contents->controller(), false); 4408 session_service->TabRestored(&view_source_contents->controller(), false);
4408 } 4409 }
4409 } 4410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698