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

Side by Side Diff: chrome/browser/ui/views/tabs/tab.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
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_TABS_TAB_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" 15 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
16 #include "ui/base/layout.h" 16 #include "ui/base/layout.h"
17 #include "ui/gfx/animation/animation_delegate.h" 17 #include "ui/gfx/animation/animation_delegate.h"
18 #include "ui/gfx/geometry/point.h" 18 #include "ui/gfx/geometry/point.h"
19 #include "ui/gfx/paint_throbber.h" 19 #include "ui/gfx/paint_throbber.h"
20 #include "ui/views/context_menu_controller.h" 20 #include "ui/views/context_menu_controller.h"
21 #include "ui/views/controls/button/button.h" 21 #include "ui/views/controls/button/button.h"
22 #include "ui/views/controls/glow_hover_controller.h" 22 #include "ui/views/controls/glow_hover_controller.h"
23 #include "ui/views/masked_targeter_delegate.h" 23 #include "ui/views/masked_targeter_delegate.h"
24 #include "ui/views/view.h" 24 #include "ui/views/view.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // The offset used to animate the favicon location. This is used when the tab 339 // The offset used to animate the favicon location. This is used when the tab
340 // crashes. 340 // crashes.
341 int favicon_hiding_offset_; 341 int favicon_hiding_offset_;
342 342
343 // Step in the immersive loading progress indicator. 343 // Step in the immersive loading progress indicator.
344 int immersive_loading_step_; 344 int immersive_loading_step_;
345 345
346 bool should_display_crashed_favicon_; 346 bool should_display_crashed_favicon_;
347 347
348 // Whole-tab throbbing "pulse" animation. 348 // Whole-tab throbbing "pulse" animation.
349 scoped_ptr<gfx::ThrobAnimation> pulse_animation_; 349 std::unique_ptr<gfx::ThrobAnimation> pulse_animation_;
350 350
351 scoped_ptr<gfx::MultiAnimation> pinned_title_change_animation_; 351 std::unique_ptr<gfx::MultiAnimation> pinned_title_change_animation_;
352 352
353 // Crash icon animation (in place of favicon). 353 // Crash icon animation (in place of favicon).
354 scoped_ptr<gfx::LinearAnimation> crash_icon_animation_; 354 std::unique_ptr<gfx::LinearAnimation> crash_icon_animation_;
355 355
356 scoped_refptr<gfx::AnimationContainer> animation_container_; 356 scoped_refptr<gfx::AnimationContainer> animation_container_;
357 357
358 ThrobberView* throbber_; 358 ThrobberView* throbber_;
359 AlertIndicatorButton* alert_indicator_button_; 359 AlertIndicatorButton* alert_indicator_button_;
360 views::ImageButton* close_button_; 360 views::ImageButton* close_button_;
361 views::Label* title_; 361 views::Label* title_;
362 362
363 bool tab_activated_with_last_tap_down_; 363 bool tab_activated_with_last_tap_down_;
364 364
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 SkColor button_color_; 397 SkColor button_color_;
398 398
399 // As the majority of the tabs are inactive, and painting tabs is slowish, 399 // As the majority of the tabs are inactive, and painting tabs is slowish,
400 // we cache a handful of the inactive tab backgrounds here. 400 // we cache a handful of the inactive tab backgrounds here.
401 static ImageCache* image_cache_; 401 static ImageCache* image_cache_;
402 402
403 DISALLOW_COPY_AND_ASSIGN(Tab); 403 DISALLOW_COPY_AND_ASSIGN(Tab);
404 }; 404 };
405 405
406 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ 406 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698