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

Side by Side Diff: ios/chrome/browser/ui/history/history_panel_view_controller.mm

Issue 2624963003: [ObjC ARC] Converts ios/chrome/browser/ui/history:history to ARC. (Closed)
Patch Set: Reparent and fix tests Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/history/history_panel_view_controller.h" 5 #import "ios/chrome/browser/ui/history/history_panel_view_controller.h"
6 6
7 #include "base/ios/block_types.h" 7 #include "base/ios/block_types.h"
8 #include "base/ios/ios_util.h" 8 #include "base/ios/ios_util.h"
9 #include "base/ios/weak_nsobject.h" 9 #include "base/ios/weak_nsobject.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/metrics/user_metrics.h" 11 #include "base/metrics/user_metrics.h"
12 #include "base/metrics/user_metrics_action.h" 12 #include "base/metrics/user_metrics_action.h"
13 #include "components/strings/grit/components_strings.h" 13 #include "components/strings/grit/components_strings.h"
14 #import "ios/chrome/browser/ui/history/clear_browsing_bar.h" 14 #import "ios/chrome/browser/ui/history/clear_browsing_bar.h"
15 #import "ios/chrome/browser/ui/history/history_collection_view_controller.h" 15 #import "ios/chrome/browser/ui/history/history_collection_view_controller.h"
16 #import "ios/chrome/browser/ui/history/history_search_view_controller.h" 16 #import "ios/chrome/browser/ui/history/history_search_view_controller.h"
17 #import "ios/chrome/browser/ui/icons/chrome_icon.h" 17 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
18 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h" 18 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
19 #import "ios/chrome/browser/ui/material_components/utils.h" 19 #import "ios/chrome/browser/ui/material_components/utils.h"
20 #import "ios/chrome/browser/ui/ntp/recent_tabs/views/panel_bar_view.h" 20 #import "ios/chrome/browser/ui/ntp/recent_tabs/views/panel_bar_view.h"
21 #import "ios/chrome/browser/ui/show_privacy_settings_util.h" 21 #import "ios/chrome/browser/ui/show_privacy_settings_util.h"
22 #import "ios/chrome/browser/ui/uikit_ui_util.h" 22 #import "ios/chrome/browser/ui/uikit_ui_util.h"
23 #import "ios/chrome/browser/ui/url_loader.h" 23 #import "ios/chrome/browser/ui/url_loader.h"
24 #include "ios/chrome/grit/ios_strings.h" 24 #include "ios/chrome/grit/ios_strings.h"
25 #import "ios/third_party/material_components_ios/src/components/AppBar/src/Mater ialAppBar.h" 25 #import "ios/third_party/material_components_ios/src/components/AppBar/src/Mater ialAppBar.h"
26 #import "ios/third_party/material_components_ios/src/components/NavigationBar/sr c/MaterialNavigationBar.h" 26 #import "ios/third_party/material_components_ios/src/components/NavigationBar/sr c/MaterialNavigationBar.h"
27 #include "ui/base/l10n/l10n_util_mac.h" 27 #include "ui/base/l10n/l10n_util_mac.h"
28 28
29 #if !defined(__has_feature) || !__has_feature(objc_arc)
30 #error "This file requires ARC support."
31 #endif
32
29 namespace { 33 namespace {
30 // Shadow opacity for the clear browsing button and the header when scrolling. 34 // Shadow opacity for the clear browsing button and the header when scrolling.
31 CGFloat kShadowOpacity = 0.2f; 35 CGFloat kShadowOpacity = 0.2f;
32 } // namespace 36 } // namespace
33 37
34 @interface HistoryPanelViewController ()< 38 @interface HistoryPanelViewController ()<
35 HistoryCollectionViewControllerDelegate, 39 HistoryCollectionViewControllerDelegate,
36 HistorySearchViewControllerDelegate> { 40 HistorySearchViewControllerDelegate> {
37 // Controller for collection view that displays history entries. 41 // Controller for collection view that displays history entries.
38 base::scoped_nsobject<HistoryCollectionViewController> 42 base::scoped_nsobject<HistoryCollectionViewController>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 111
108 - (instancetype)initWithCoder:(NSCoder*)aDecoder { 112 - (instancetype)initWithCoder:(NSCoder*)aDecoder {
109 NOTREACHED(); 113 NOTREACHED();
110 return nil; 114 return nil;
111 } 115 }
112 116
113 + (UIViewController*)controllerToPresentForBrowserState: 117 + (UIViewController*)controllerToPresentForBrowserState:
114 (ios::ChromeBrowserState*)browserState 118 (ios::ChromeBrowserState*)browserState
115 loader:(id<UrlLoader>)loader { 119 loader:(id<UrlLoader>)loader {
116 HistoryPanelViewController* historyPanelController = 120 HistoryPanelViewController* historyPanelController =
117 [[[HistoryPanelViewController alloc] initWithLoader:loader 121 [[HistoryPanelViewController alloc] initWithLoader:loader
118 browserState:browserState] 122 browserState:browserState];
119 autorelease];
120 return historyPanelController; 123 return historyPanelController;
121 } 124 }
122 125
123 - (void)viewDidLoad { 126 - (void)viewDidLoad {
124 [super viewDidLoad]; 127 [super viewDidLoad];
125 [self setTitle:l10n_util::GetNSString(IDS_HISTORY_TITLE)]; 128 [self setTitle:l10n_util::GetNSString(IDS_HISTORY_TITLE)];
126 129
127 _containerView.reset([[UIView alloc] initWithFrame:self.view.frame]); 130 _containerView.reset([[UIView alloc] initWithFrame:self.view.frame]);
128 [_containerView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | 131 [_containerView setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
129 UIViewAutoresizingFlexibleHeight]; 132 UIViewAutoresizingFlexibleHeight];
(...skipping 16 matching lines...) Expand all
146 [_clearBrowsingBar setTranslatesAutoresizingMaskIntoConstraints:NO]; 149 [_clearBrowsingBar setTranslatesAutoresizingMaskIntoConstraints:NO];
147 [_containerView addSubview:_clearBrowsingBar]; 150 [_containerView addSubview:_clearBrowsingBar];
148 [self configureClearBrowsingBar]; 151 [self configureClearBrowsingBar];
149 152
150 ConfigureAppBarWithCardStyle(_appBar); 153 ConfigureAppBarWithCardStyle(_appBar);
151 [_appBar headerViewController].headerView.trackingScrollView = 154 [_appBar headerViewController].headerView.trackingScrollView =
152 [_historyCollectionController collectionView]; 155 [_historyCollectionController collectionView];
153 [_appBar addSubviewsToParent]; 156 [_appBar addSubviewsToParent];
154 157
155 // Add navigation bar buttons. 158 // Add navigation bar buttons.
156 _leftBarButtonItem.reset([[ChromeIcon 159 _leftBarButtonItem.reset([ChromeIcon
157 templateBarButtonItemWithImage:[ChromeIcon searchIcon] 160 templateBarButtonItemWithImage:[ChromeIcon searchIcon]
158 target:self 161 target:self
159 action:@selector(enterSearchMode)] retain]); 162 action:@selector(enterSearchMode)]);
160 self.navigationItem.leftBarButtonItem = _leftBarButtonItem; 163 self.navigationItem.leftBarButtonItem = _leftBarButtonItem;
161 _rightBarButtonItem.reset([[UIBarButtonItem alloc] 164 _rightBarButtonItem.reset([[UIBarButtonItem alloc]
162 initWithTitle:l10n_util::GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON) 165 initWithTitle:l10n_util::GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)
163 style:UIBarButtonItemStylePlain 166 style:UIBarButtonItemStylePlain
164 target:self 167 target:self
165 action:@selector(closeHistory)]); 168 action:@selector(closeHistory)]);
166 self.navigationItem.rightBarButtonItem = _rightBarButtonItem; 169 self.navigationItem.rightBarButtonItem = _rightBarButtonItem;
167 [self configureNavigationBar]; 170 [self configureNavigationBar];
168 } 171 }
169 172
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 base::WeakNSObject<HistoryPanelViewController> weakSelf(self); 411 base::WeakNSObject<HistoryPanelViewController> weakSelf(self);
409 return @[ [UIKeyCommand cr_keyCommandWithInput:UIKeyInputEscape 412 return @[ [UIKeyCommand cr_keyCommandWithInput:UIKeyInputEscape
410 modifierFlags:Cr_UIKeyModifierNone 413 modifierFlags:Cr_UIKeyModifierNone
411 title:nil 414 title:nil
412 action:^{ 415 action:^{
413 [weakSelf closeHistory]; 416 [weakSelf closeHistory];
414 }] ]; 417 }] ];
415 } 418 }
416 419
417 @end 420 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698