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

Side by Side Diff: apps/shell/browser/default_shell_browser_main_delegate.cc

Issue 308783002: Removes the dependency to WMTestHelper from app shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/shell/browser/default_shell_browser_main_delegate.h" 5 #include "apps/shell/browser/default_shell_browser_main_delegate.h"
6 6
7 #include "apps/shell/browser/shell_desktop_controller.h"
7 #include "apps/shell/browser/shell_extension_system.h" 8 #include "apps/shell/browser/shell_extension_system.h"
8 #include "base/command_line.h" 9 #include "base/command_line.h"
9 #include "base/file_util.h" 10 #include "base/file_util.h"
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 12
12 namespace apps { 13 namespace apps {
13 14
14 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { 15 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
15 } 16 }
16 17
(...skipping 13 matching lines...) Expand all
30 extensions::ExtensionSystem::Get(browser_context)); 31 extensions::ExtensionSystem::Get(browser_context));
31 extension_system->LoadAndLaunchApp(app_absolute_dir); 32 extension_system->LoadAndLaunchApp(app_absolute_dir);
32 } else { 33 } else {
33 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future"; 34 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future";
34 } 35 }
35 } 36 }
36 37
37 void DefaultShellBrowserMainDelegate::Shutdown() { 38 void DefaultShellBrowserMainDelegate::Shutdown() {
38 } 39 }
39 40
41 ShellDesktopController*
42 DefaultShellBrowserMainDelegate::CreateDesktopController() {
43 return new ShellDesktopController();
44 }
45
40 } // namespace apps 46 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698