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

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/common/shelf/shelf_view.h" 5 #include "ash/shelf/shelf_view.h"
6 #include "ash/common/shelf/wm_shelf.h" 6 #include "ash/shelf/wm_shelf.h"
7 #include "ash/common/wm_window.h"
8 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm_window.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
15 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/lifetime/keep_alive_types.h" 17 #include "chrome/browser/lifetime/keep_alive_types.h"
18 #include "chrome/browser/lifetime/scoped_keep_alive.h" 18 #include "chrome/browser/lifetime/scoped_keep_alive.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 CloseBrowser(browser_list->get(0)); 199 CloseBrowser(browser_list->get(0));
200 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]); 200 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);
201 201
202 // Next new browser must be created on 1st display. 202 // Next new browser must be created on 1st display.
203 ASSERT_EQ(1u, browser_list->size()); 203 ASSERT_EQ(1u, browser_list->size());
204 EXPECT_EQ(root_windows[0], 204 EXPECT_EQ(root_windows[0],
205 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow()); 205 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
206 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow()); 206 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
207 } 207 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_ash.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698