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

Side by Side Diff: ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.mm

Issue 2733823003: Move final vector icons out of ui/gfx/vector_icons/ and remove the (Closed)
Patch Set: fix deps Created 3 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
« no previous file with comments | « components/toolbar/vector_icons/business.icon ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/toolbar/toolbar_model_delegate_ios.h" 5 #import "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "components/omnibox/browser/autocomplete_classifier.h" 8 #include "components/omnibox/browser/autocomplete_classifier.h"
9 #include "components/omnibox/browser/autocomplete_input.h" 9 #include "components/omnibox/browser/autocomplete_input.h"
10 #include "components/omnibox/browser/autocomplete_match.h" 10 #include "components/omnibox/browser/autocomplete_match.h"
11 #include "components/prefs/pref_service.h" 11 #include "components/prefs/pref_service.h"
12 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h" 12 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h"
13 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 13 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
14 #include "ios/chrome/browser/chrome_url_constants.h" 14 #include "ios/chrome/browser/chrome_url_constants.h"
15 #include "ios/chrome/browser/pref_names.h" 15 #include "ios/chrome/browser/pref_names.h"
16 #include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h" 16 #include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h"
17 #import "ios/chrome/browser/tabs/tab.h" 17 #import "ios/chrome/browser/tabs/tab.h"
18 #import "ios/chrome/browser/tabs/tab_model.h" 18 #import "ios/chrome/browser/tabs/tab_model.h"
19 #import "ios/web/public/navigation_item.h" 19 #import "ios/web/public/navigation_item.h"
20 #import "ios/web/public/web_state/web_state.h" 20 #import "ios/web/public/web_state/web_state.h"
21 #include "ui/gfx/vector_icons_public.h"
22 21
23 ToolbarModelDelegateIOS::ToolbarModelDelegateIOS(TabModel* tab_model) 22 ToolbarModelDelegateIOS::ToolbarModelDelegateIOS(TabModel* tab_model)
24 : tab_model_([tab_model retain]) {} 23 : tab_model_([tab_model retain]) {}
25 24
26 ToolbarModelDelegateIOS::~ToolbarModelDelegateIOS() {} 25 ToolbarModelDelegateIOS::~ToolbarModelDelegateIOS() {}
27 26
28 void ToolbarModelDelegateIOS::SetTabModel(TabModel* tab_model) { 27 void ToolbarModelDelegateIOS::SetTabModel(TabModel* tab_model) {
29 DCHECK(tab_model); 28 DCHECK(tab_model);
30 tab_model_.reset([tab_model retain]); 29 tab_model_.reset([tab_model retain]);
31 } 30 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 auto* client = IOSSecurityStateTabHelper::FromWebState(web_state); 102 auto* client = IOSSecurityStateTabHelper::FromWebState(web_state);
104 security_state::SecurityInfo result; 103 security_state::SecurityInfo result;
105 client->GetSecurityInfo(&result); 104 client->GetSecurityInfo(&result);
106 return result.malicious_content_status != 105 return result.malicious_content_status !=
107 security_state::MALICIOUS_CONTENT_STATUS_NONE; 106 security_state::MALICIOUS_CONTENT_STATUS_NONE;
108 } 107 }
109 108
110 const gfx::VectorIcon* ToolbarModelDelegateIOS::GetVectorIconOverride() const { 109 const gfx::VectorIcon* ToolbarModelDelegateIOS::GetVectorIconOverride() const {
111 return nullptr; 110 return nullptr;
112 } 111 }
OLDNEW
« no previous file with comments | « components/toolbar/vector_icons/business.icon ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698