ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm - Issue 2806353002: [ios] Move WebStateList to ios/chrome/browser/web_state_list.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.mm

Issue 2806353002: [ios] Move WebStateList to ios/chrome/browser/web_state_list. (Closed)

Patch Set: Fix semantic conflict. 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

« no previous file with comments | « ios/clean/chrome/browser/ui/web_contents/BUILD.gn ('k') | ios/clean/chrome/browser/ui/web_contents/web_contents_mediator_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2017 The Chromium Authors. All rights reserved.	1 // Copyright 2017 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/clean/chrome/browser/ui/web_contents/web_contents_mediator.h"	5 #import "ios/clean/chrome/browser/ui/web_contents/web_contents_mediator.h"

6	6

7 #include "base/memory/ptr_util.h"	7 #include "base/memory/ptr_util.h"

8 #include "ios/chrome/browser/chrome_url_constants.h"	8 #include "ios/chrome/browser/chrome_url_constants.h"

	9 #import "ios/chrome/browser/web_state_list/web_state_list.h"

	10 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"

9 #import "ios/clean/chrome/browser/ui/web_contents/web_contents_consumer.h"	11 #import "ios/clean/chrome/browser/ui/web_contents/web_contents_consumer.h"

10 #import "ios/shared/chrome/browser/tabs/web_state_list.h"

11 #import "ios/shared/chrome/browser/tabs/web_state_list_observer_bridge.h"

12 #import "ios/web/public/navigation_manager.h"	12 #import "ios/web/public/navigation_manager.h"

13 #include "ios/web/public/web_state/web_state.h"	13 #include "ios/web/public/web_state/web_state.h"

14 #include "ui/base/page_transition_types.h"	14 #include "ui/base/page_transition_types.h"

15 #include "url/gurl.h"	15 #include "url/gurl.h"

16	16

17 #if !defined(__has_feature) \|\| !__has_feature(objc_arc)	17 #if !defined(__has_feature) \|\| !__has_feature(objc_arc)

18 #error "This file requires ARC support."	18 #error "This file requires ARC support."

19 #endif	19 #endif

20	20

21 @interface WebContentsMediator ()<WebStateListObserving>	21 @interface WebContentsMediator ()<WebStateListObserving>

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 // PLACEHOLDER: This navigates the page since the omnibox is not yet hooked up.	103 // PLACEHOLDER: This navigates the page since the omnibox is not yet hooked up.

104 - (void)navigateToDefaultPage:(web::WebState*)webState {	104 - (void)navigateToDefaultPage:(web::WebState*)webState {

105 if (!webState->GetNavigationManager()->GetItemCount()) {	105 if (!webState->GetNavigationManager()->GetItemCount()) {

106 web::NavigationManager::WebLoadParams params((GURL(kChromeUINewTabURL)));	106 web::NavigationManager::WebLoadParams params((GURL(kChromeUINewTabURL)));

107 params.transition_type = ui::PAGE_TRANSITION_TYPED;	107 params.transition_type = ui::PAGE_TRANSITION_TYPED;

108 webState->GetNavigationManager()->LoadURLWithParams(params);	108 webState->GetNavigationManager()->LoadURLWithParams(params);

109 }	109 }

110 }	110 }

111	111

112 @end	112 @end

OLD	NEW