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

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 114263005: Convert Extension* to extension id in AppLaunchParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile Created 7 years 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 | « apps/launcher.cc ('k') | chrome/browser/extensions/api/socket/socket_apitest.cc » ('j') | 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 "apps/launcher.h" 5 #include "apps/launcher.h"
6 #include "apps/shell_window.h" 6 #include "apps/shell_window.h"
7 #include "apps/shell_window_registry.h" 7 #include "apps/shell_window_registry.h"
8 #include "apps/ui/native_app_window.h" 8 #include "apps/ui/native_app_window.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 517
518 // Load the extension 518 // Load the extension
519 ResultCatcher catcher; 519 ResultCatcher catcher;
520 const Extension* extension = LoadExtension( 520 const Extension* extension = LoadExtension(
521 test_data_dir_.AppendASCII("platform_apps/launch_file")); 521 test_data_dir_.AppendASCII("platform_apps/launch_file"));
522 ASSERT_TRUE(extension); 522 ASSERT_TRUE(extension);
523 523
524 // Run the test 524 // Run the test
525 AppLaunchParams params( 525 AppLaunchParams params(
526 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW); 526 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW);
527 params.command_line = CommandLine::ForCurrentProcess(); 527 params.command_line = *CommandLine::ForCurrentProcess();
528 params.current_directory = test_data_dir_; 528 params.current_directory = test_data_dir_;
529 OpenApplication(params); 529 OpenApplication(params);
530 530
531 if (!catcher.GetNextResult()) { 531 if (!catcher.GetNextResult()) {
532 message_ = catcher.message(); 532 message_ = catcher.message();
533 ASSERT_TRUE(0); 533 ASSERT_TRUE(0);
534 } 534 }
535 } 535 }
536 536
537 // Tests that launch data is sent through if the file extension matches. 537 // Tests that launch data is sent through if the file extension matches.
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 false); 1287 false);
1288 ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied()); 1288 ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied());
1289 1289
1290 EXPECT_EQ(1, request_restart_call_count()); 1290 EXPECT_EQ(1, request_restart_call_count());
1291 } 1291 }
1292 1292
1293 #endif // defined(OS_CHROMEOS) 1293 #endif // defined(OS_CHROMEOS)
1294 1294
1295 1295
1296 } // namespace extensions 1296 } // namespace extensions
OLDNEW
« no previous file with comments | « apps/launcher.cc ('k') | chrome/browser/extensions/api/socket/socket_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698