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

Side by Side Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2812623002: Revert of [ios] Move WebStateList to ios/chrome/browser/web_state_list. (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #import "ios/chrome/browser/ui/browser_view_controller.h" 5 #import "ios/chrome/browser/ui/browser_view_controller.h"
6 6
7 #import <AssetsLibrary/AssetsLibrary.h> 7 #import <AssetsLibrary/AssetsLibrary.h>
8 #import <MobileCoreServices/MobileCoreServices.h> 8 #import <MobileCoreServices/MobileCoreServices.h>
9 #import <PassKit/PassKit.h> 9 #import <PassKit/PassKit.h>
10 #import <Photos/Photos.h> 10 #import <Photos/Photos.h>
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h" 152 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h"
153 #include "ios/chrome/browser/ui/ui_util.h" 153 #include "ios/chrome/browser/ui/ui_util.h"
154 #import "ios/chrome/browser/ui/uikit_ui_util.h" 154 #import "ios/chrome/browser/ui/uikit_ui_util.h"
155 #import "ios/chrome/browser/ui/util/pasteboard_util.h" 155 #import "ios/chrome/browser/ui/util/pasteboard_util.h"
156 #import "ios/chrome/browser/ui/voice/text_to_speech_player.h" 156 #import "ios/chrome/browser/ui/voice/text_to_speech_player.h"
157 #include "ios/chrome/browser/upgrade/upgrade_center.h" 157 #include "ios/chrome/browser/upgrade/upgrade_center.h"
158 #import "ios/chrome/browser/web/blocked_popup_tab_helper.h" 158 #import "ios/chrome/browser/web/blocked_popup_tab_helper.h"
159 #import "ios/chrome/browser/web/error_page_content.h" 159 #import "ios/chrome/browser/web/error_page_content.h"
160 #import "ios/chrome/browser/web/passkit_dialog_provider.h" 160 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
161 #import "ios/chrome/browser/web/repost_form_tab_helper.h" 161 #import "ios/chrome/browser/web/repost_form_tab_helper.h"
162 #import "ios/chrome/browser/web_state_list/web_state_list.h"
163 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
164 #import "ios/chrome/browser/xcallback_parameters.h" 162 #import "ios/chrome/browser/xcallback_parameters.h"
165 #import "ios/chrome/common/material_timing.h" 163 #import "ios/chrome/common/material_timing.h"
166 #include "ios/chrome/grit/ios_chromium_strings.h" 164 #include "ios/chrome/grit/ios_chromium_strings.h"
167 #include "ios/chrome/grit/ios_strings.h" 165 #include "ios/chrome/grit/ios_strings.h"
168 #import "ios/net/request_tracker.h" 166 #import "ios/net/request_tracker.h"
169 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" 167 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
170 #include "ios/public/provider/chrome/browser/ui/app_rating_prompt.h" 168 #include "ios/public/provider/chrome/browser/ui/app_rating_prompt.h"
171 #include "ios/public/provider/chrome/browser/ui/default_ios_web_view_factory.h" 169 #include "ios/public/provider/chrome/browser/ui/default_ios_web_view_factory.h"
172 #import "ios/public/provider/chrome/browser/voice/voice_search_bar.h" 170 #import "ios/public/provider/chrome/browser/voice/voice_search_bar.h"
173 #import "ios/public/provider/chrome/browser/voice/voice_search_bar_owner.h" 171 #import "ios/public/provider/chrome/browser/voice/voice_search_bar_owner.h"
174 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h" 172 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
175 #include "ios/public/provider/chrome/browser/voice/voice_search_controller_deleg ate.h" 173 #include "ios/public/provider/chrome/browser/voice/voice_search_controller_deleg ate.h"
176 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h" 174 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
175 #import "ios/shared/chrome/browser/tabs/web_state_list.h"
176 #import "ios/shared/chrome/browser/tabs/web_state_opener.h"
177 #include "ios/web/public/active_state_manager.h" 177 #include "ios/web/public/active_state_manager.h"
178 #include "ios/web/public/navigation_item.h" 178 #include "ios/web/public/navigation_item.h"
179 #import "ios/web/public/navigation_manager.h" 179 #import "ios/web/public/navigation_manager.h"
180 #include "ios/web/public/referrer_util.h" 180 #include "ios/web/public/referrer_util.h"
181 #include "ios/web/public/ssl_status.h" 181 #include "ios/web/public/ssl_status.h"
182 #include "ios/web/public/url_scheme_util.h" 182 #include "ios/web/public/url_scheme_util.h"
183 #include "ios/web/public/user_agent.h" 183 #include "ios/web/public/user_agent.h"
184 #include "ios/web/public/web_client.h" 184 #include "ios/web/public/web_client.h"
185 #import "ios/web/public/web_state/context_menu_params.h" 185 #import "ios/web/public/web_state/context_menu_params.h"
186 #import "ios/web/public/web_state/ui/crw_native_content_provider.h" 186 #import "ios/web/public/web_state/ui/crw_native_content_provider.h"
(...skipping 4959 matching lines...) Expand 10 before | Expand all | Expand 10 after
5146 5146
5147 - (UIView*)voiceSearchButton { 5147 - (UIView*)voiceSearchButton {
5148 return _voiceSearchButton; 5148 return _voiceSearchButton;
5149 } 5149 }
5150 5150
5151 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5151 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5152 return [self currentLogoAnimationControllerOwner]; 5152 return [self currentLogoAnimationControllerOwner];
5153 } 5153 }
5154 5154
5155 @end 5155 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/BUILD.gn ('k') | ios/chrome/browser/ui/browser_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698