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

Side by Side Diff: ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.mm

Issue 2602903002: Factor iOS native image loading into a utility function. (Closed)
Patch Set: Fixed BUILD files. 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/tab_switcher/tab_switcher_controller.h" 5 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.h"
6 6
7 #include "base/ios/block_types.h" 7 #include "base/ios/block_types.h"
8 #include "base/ios/weak_nsobject.h" 8 #include "base/ios/weak_nsobject.h"
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/metrics/user_metrics.h" 10 #include "base/metrics/user_metrics.h"
(...skipping 27 matching lines...) Expand all
38 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.h" 38 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.h"
39 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_controller.h" 39 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_controller.h"
40 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_overlay_view.h" 40 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_overlay_view.h"
41 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.h" 41 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.h"
42 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_session_cell_data.h" 42 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_session_cell_data.h"
43 #include "ios/chrome/browser/ui/tab_switcher/tab_switcher_transition_context.h" 43 #include "ios/chrome/browser/ui/tab_switcher/tab_switcher_transition_context.h"
44 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_view.h" 44 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_view.h"
45 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h" 45 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
46 #import "ios/chrome/browser/ui/toolbar/toolbar_owner.h" 46 #import "ios/chrome/browser/ui/toolbar/toolbar_owner.h"
47 #include "ios/chrome/browser/ui/ui_util.h" 47 #include "ios/chrome/browser/ui/ui_util.h"
48 #import "ios/chrome/browser/ui/uikit_ui_util.h"
48 #include "ios/chrome/grit/ios_strings.h" 49 #include "ios/chrome/grit/ios_strings.h"
49 #include "ios/chrome/grit/ios_theme_resources.h" 50 #include "ios/chrome/grit/ios_theme_resources.h"
50 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat erialPalettes.h" 51 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat erialPalettes.h"
51 #import "ios/web/public/navigation_manager.h" 52 #import "ios/web/public/navigation_manager.h"
52 #include "ios/web/public/referrer.h" 53 #include "ios/web/public/referrer.h"
53 #import "ios/web/web_state/ui/crw_web_controller.h" 54 #import "ios/web/web_state/ui/crw_web_controller.h"
54 #include "ui/base/l10n/l10n_util.h" 55 #include "ui/base/l10n/l10n_util.h"
55 #include "ui/base/l10n/l10n_util_mac.h" 56 #include "ui/base/l10n/l10n_util_mac.h"
56 #include "ui/base/resource/resource_bundle.h"
57 57
58 namespace { 58 namespace {
59 59
60 // Offsets for computing the panels' indexes in the TabSwitcherView. 60 // Offsets for computing the panels' indexes in the TabSwitcherView.
61 const int kSignInPromoPanelIndex = 2; 61 const int kSignInPromoPanelIndex = 2;
62 const int kHeaderDistantSessionIndexOffset = 2; 62 const int kHeaderDistantSessionIndexOffset = 2;
63 const int kLocalTabsOffTheRecordPanelIndex = 0; 63 const int kLocalTabsOffTheRecordPanelIndex = 0;
64 const int kLocalTabsOnTheRecordPanelIndex = 1; 64 const int kLocalTabsOnTheRecordPanelIndex = 1;
65 // The duration of the tab switcher toggle animation. 65 // The duration of the tab switcher toggle animation.
66 const CGFloat kTransitionAnimationDuration = 0.25; 66 const CGFloat kTransitionAnimationDuration = 0.25;
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 [placeholderView addSubview:finalToolbarScreenshotImageView]; 665 [placeholderView addSubview:finalToolbarScreenshotImageView];
666 666
667 UIView* toolbarScreenshotImageView = 667 UIView* toolbarScreenshotImageView =
668 transitionContextContent.toolbarSnapshotView; 668 transitionContextContent.toolbarSnapshotView;
669 toolbarScreenshotImageView.autoresizingMask = UIViewAutoresizingNone; 669 toolbarScreenshotImageView.autoresizingMask = UIViewAutoresizingNone;
670 toolbarScreenshotImageView.frame = initialToolbarScreenshotFrame; 670 toolbarScreenshotImageView.frame = initialToolbarScreenshotFrame;
671 [placeholderView addSubview:toolbarScreenshotImageView]; 671 [placeholderView addSubview:toolbarScreenshotImageView];
672 672
673 base::scoped_nsobject<UIImageView> toolbarShadowImageView( 673 base::scoped_nsobject<UIImageView> toolbarShadowImageView(
674 [[UIImageView alloc] initWithFrame:shadowInitialFrame]); 674 [[UIImageView alloc] initWithFrame:shadowInitialFrame]);
675 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
676 gfx::Image shadow = rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_SHADOW);
677 [toolbarShadowImageView setAutoresizingMask:UIViewAutoresizingNone]; 675 [toolbarShadowImageView setAutoresizingMask:UIViewAutoresizingNone];
678 [toolbarShadowImageView setImage:shadow.ToUIImage()]; 676 [toolbarShadowImageView setImage:NativeImage(IDR_IOS_TOOLBAR_SHADOW)];
679 [placeholderView addSubview:toolbarShadowImageView]; 677 [placeholderView addSubview:toolbarShadowImageView];
680 678
681 [self.view addSubview:placeholderView]; 679 [self.view addSubview:placeholderView];
682 680
683 [selectedCell setHidden:YES]; 681 [selectedCell setHidden:YES];
684 toolbarScreenshotImageView.alpha = 682 toolbarScreenshotImageView.alpha =
685 (transitionType == TransitionType::TRANSITION_DISMISS) ? 0 : 1.0; 683 (transitionType == TransitionType::TRANSITION_DISMISS) ? 0 : 1.0;
686 684
687 base::WeakNSObject<TabSwitcherController> weakSelf(self); 685 base::WeakNSObject<TabSwitcherController> weakSelf(self);
688 void (^completionBlock)(BOOL) = ^(BOOL) { 686 void (^completionBlock)(BOOL) = ^(BOOL) {
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 base::UserMetricsAction("MobileTabSwitcherCloseNonIncognitoTab")); 1238 base::UserMetricsAction("MobileTabSwitcherCloseNonIncognitoTab"));
1241 } 1239 }
1242 } 1240 }
1243 1241
1244 - (void)tabSwitcherPanelControllerDidUpdateOverlayViewVisibility: 1242 - (void)tabSwitcherPanelControllerDidUpdateOverlayViewVisibility:
1245 (TabSwitcherPanelController*)tabSwitcherPanelController { 1243 (TabSwitcherPanelController*)tabSwitcherPanelController {
1246 [_tabSwitcherView updateOverlayButtonState]; 1244 [_tabSwitcherView updateOverlayButtonState];
1247 } 1245 }
1248 1246
1249 @end 1247 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698