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

Side by Side Diff: chrome/browser/extensions/extension_apitest.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
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 #include "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 368
369 if (use_incognito) 369 if (use_incognito)
370 ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url); 370 ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url);
371 else 371 else
372 ui_test_utils::NavigateToURL(browser(), url); 372 ui_test_utils::NavigateToURL(browser(), url);
373 } else if (launch_platform_app) { 373 } else if (launch_platform_app) {
374 AppLaunchParams params(browser()->profile(), 374 AppLaunchParams params(browser()->profile(),
375 extension, 375 extension,
376 extensions::LAUNCH_CONTAINER_NONE, 376 extensions::LAUNCH_CONTAINER_NONE,
377 NEW_WINDOW); 377 NEW_WINDOW);
378 params.command_line = CommandLine::ForCurrentProcess(); 378 params.command_line = *CommandLine::ForCurrentProcess();
379 OpenApplication(params); 379 OpenApplication(params);
380 } 380 }
381 381
382 if (!catcher.GetNextResult()) { 382 if (!catcher.GetNextResult()) {
383 message_ = catcher.message(); 383 message_ = catcher.message();
384 return false; 384 return false;
385 } 385 }
386 386
387 return true; 387 return true;
388 } 388 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 test_config_->SetInteger(kSpawnedTestServerPort, 457 test_config_->SetInteger(kSpawnedTestServerPort,
458 test_server()->host_port_pair().port()); 458 test_server()->host_port_pair().port());
459 459
460 return true; 460 return true;
461 } 461 }
462 462
463 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) { 463 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
464 ExtensionBrowserTest::SetUpCommandLine(command_line); 464 ExtensionBrowserTest::SetUpCommandLine(command_line);
465 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); 465 test_data_dir_ = test_data_dir_.AppendASCII("api_test");
466 } 466 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/socket/socket_apitest.cc ('k') | chrome/browser/ui/extensions/application_launch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698