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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 436503002: Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 560785a3e985ef2e9e1e6c86fadcc262d48b89d5..65946a326c83b1775a1c762e51e0b86bdfd7cd5c 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -54,7 +54,6 @@
#include "ash/test/test_shell_delegate.h"
#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
#include "chrome/browser/ui/apps/chrome_app_delegate.h"
-#include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
@@ -745,10 +744,7 @@ class V1App : public TestBrowserWindow {
class V2App {
public:
V2App(Profile* profile, const extensions::Extension* extension) {
- window_ = new apps::AppWindow(profile,
- new ChromeAppDelegate(),
- new ChromeAppWindowDelegate(),
- extension);
+ window_ = new apps::AppWindow(profile, new ChromeAppDelegate(), extension);
apps::AppWindow::CreateParams params = apps::AppWindow::CreateParams();
window_->Init(
GURL(std::string()), new apps::AppWindowContentsImpl(window_), params);
« no previous file with comments | « chrome/browser/ui/apps/chrome_apps_client.cc ('k') | chrome/browser/ui/cocoa/apps/chrome_app_window_delegate_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698