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

Side by Side Diff: ash/test/ash_test_helper.cc

Issue 2861773003: chromeos: Fix crash when clicking on networking menu under mash (Closed)
Patch Set: review comments Created 3 years, 7 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 | « ash/system/network/tray_network_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/test/ash_test_helper.h" 5 #include "ash/test/ash_test_helper.h"
6 6
7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/aura/shell_port_classic.h" 9 #include "ash/aura/shell_port_classic.h"
10 #include "ash/mus/bridge/shell_port_mash.h" 10 #include "ash/mus/bridge/shell_port_mash.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 aura::WindowTreeClient* window_tree_client = 347 aura::WindowTreeClient* window_tree_client =
348 window_manager_app_->window_manager()->window_tree_client(); 348 window_manager_app_->window_manager()->window_tree_client();
349 window_tree_client_private_ = 349 window_tree_client_private_ =
350 base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client); 350 base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
351 if (config_ == Config::MUS) { 351 if (config_ == Config::MUS) {
352 window_tree_client_private_->CallOnConnect(); 352 window_tree_client_private_->CallOnConnect();
353 } else { 353 } else {
354 int next_x = 0; 354 int next_x = 0;
355 CreateRootWindowController("800x600", &next_x); 355 CreateRootWindowController("800x600", &next_x);
356 } 356 }
357
358 // Make sure the NetworkHandler didn't get turned on, see above comment as to
359 // why the NetworkHandler should not be running.
360 CHECK(!chromeos::NetworkHandler::IsInitialized());
361 } 357 }
362 358
363 void AshTestHelper::CreateShell() { 359 void AshTestHelper::CreateShell() {
364 CHECK(config_ == Config::CLASSIC); 360 CHECK(config_ == Config::CLASSIC);
365 ui::ContextFactory* context_factory = nullptr; 361 ui::ContextFactory* context_factory = nullptr;
366 ui::ContextFactoryPrivate* context_factory_private = nullptr; 362 ui::ContextFactoryPrivate* context_factory_private = nullptr;
367 bool enable_pixel_output = false; 363 bool enable_pixel_output = false;
368 ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory, 364 ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
369 &context_factory_private); 365 &context_factory_private);
370 ShellInitParams init_params; 366 ShellInitParams init_params;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 std::set<RootWindowController*> roots = 411 std::set<RootWindowController*> roots =
416 window_manager_app_->window_manager()->GetRootWindowControllers(); 412 window_manager_app_->window_manager()->GetRootWindowControllers();
417 std::vector<RootWindowController*> ordered_roots; 413 std::vector<RootWindowController*> ordered_roots;
418 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); 414 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
419 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); 415 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
420 return ordered_roots; 416 return ordered_roots;
421 } 417 }
422 418
423 } // namespace test 419 } // namespace test
424 } // namespace ash 420 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/network/tray_network_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698