chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc

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

OLD	NEW
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 #include "chrome/browser/ui/views/ash/tab_scrubber.h"	5 #include "chrome/browser/ui/views/ash/tab_scrubber.h"

6	6

	7 #include <memory>

	8

7 #include "ash/display/event_transformation_handler.h"	9 #include "ash/display/event_transformation_handler.h"

8 #include "ash/shell.h"	10 #include "ash/shell.h"

9 #include "base/command_line.h"	11 #include "base/command_line.h"

10 #include "base/macros.h"	12 #include "base/macros.h"

11 #include "base/memory/scoped_ptr.h"

12 #include "base/run_loop.h"	13 #include "base/run_loop.h"

13 #include "build/build_config.h"	14 #include "build/build_config.h"

14 #include "chrome/browser/ui/browser_tabstrip.h"	15 #include "chrome/browser/ui/browser_tabstrip.h"

15 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"	17 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"

17 #include "chrome/browser/ui/views/frame/browser_view.h"	18 #include "chrome/browser/ui/views/frame/browser_view.h"

18 #include "chrome/browser/ui/views/tabs/tab.h"	19 #include "chrome/browser/ui/views/tabs/tab.h"

19 #include "chrome/browser/ui/views/tabs/tab_strip.h"	20 #include "chrome/browser/ui/views/tabs/tab_strip.h"

20 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

21 #include "chrome/test/base/in_process_browser_test.h"	22 #include "chrome/test/base/in_process_browser_test.h"

(...skipping 474 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
496	497

497 SendScrubEvent(browser(), 1);	498 SendScrubEvent(browser(), 1);

498 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());	499 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());

499 browser()->tab_strip_model()->ToggleSelectionAt(0);	500 browser()->tab_strip_model()->ToggleSelectionAt(0);

500 browser()->tab_strip_model()->ToggleSelectionAt(2);	501 browser()->tab_strip_model()->ToggleSelectionAt(2);

501 browser()->tab_strip_model()->MoveSelectedTabsTo(2);	502 browser()->tab_strip_model()->MoveSelectedTabsTo(2);

502 EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab());	503 EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab());

503 }	504 }

504	505

505 #endif // defined(OS_CHROMEOS)	506 #endif // defined(OS_CHROMEOS)

OLD	NEW