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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 2442953002: Remove stl_util's deletion function use from chrome/. (Closed)
Patch Set: fix Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // ChromeOmniboxEditController: 251 // ChromeOmniboxEditController:
252 void UpdateWithoutTabRestore() override; 252 void UpdateWithoutTabRestore() override;
253 ToolbarModel* GetToolbarModel() override; 253 ToolbarModel* GetToolbarModel() override;
254 content::WebContents* GetWebContents() override; 254 content::WebContents* GetWebContents() override;
255 255
256 // ZoomEventManagerObserver: 256 // ZoomEventManagerObserver:
257 // Updates the view for the zoom icon when default zoom levels change. 257 // Updates the view for the zoom icon when default zoom levels change.
258 void OnDefaultZoomLevelChanged() override; 258 void OnDefaultZoomLevelChanged() override;
259 259
260 private: 260 private:
261 typedef std::vector<ContentSettingImageView*> ContentSettingViews; 261 using ContentSettingViews = std::vector<ContentSettingImageView*>;
262 262
263 friend class PageActionImageView; 263 friend class PageActionImageView;
264 friend class PageActionWithBadgeView; 264 friend class PageActionWithBadgeView;
265 typedef std::vector<ExtensionAction*> PageActions; 265 using PageActions = std::vector<ExtensionAction*>;
266 typedef std::vector<PageActionWithBadgeView*> PageActionViews; 266 using PageActionViews = std::vector<std::unique_ptr<PageActionWithBadgeView>>;
267 267
268 // Helper for GetMinimumWidth(). Calculates the incremental minimum width 268 // Helper for GetMinimumWidth(). Calculates the incremental minimum width
269 // |view| should add to the trailing width after the omnibox. 269 // |view| should add to the trailing width after the omnibox.
270 int IncrementalMinimumWidth(views::View* view) const; 270 int IncrementalMinimumWidth(views::View* view) const;
271 271
272 // Returns the thickness of any visible edge, in pixels. 272 // Returns the thickness of any visible edge, in pixels.
273 int GetHorizontalEdgeThickness() const; 273 int GetHorizontalEdgeThickness() const;
274 int GetVerticalEdgeThickness() const; 274 int GetVerticalEdgeThickness() const;
275 275
276 // Returns the total amount of space reserved above or below the content, 276 // Returns the total amount of space reserved above or below the content,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 // These allow toggling the verbose security state behavior via flags. 482 // These allow toggling the verbose security state behavior via flags.
483 bool should_show_secure_state_; 483 bool should_show_secure_state_;
484 bool should_show_nonsecure_state_; 484 bool should_show_nonsecure_state_;
485 bool should_animate_secure_state_; 485 bool should_animate_secure_state_;
486 bool should_animate_nonsecure_state_; 486 bool should_animate_nonsecure_state_;
487 487
488 DISALLOW_COPY_AND_ASSIGN(LocationBarView); 488 DISALLOW_COPY_AND_ASSIGN(LocationBarView);
489 }; 489 };
490 490
491 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 491 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698