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

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

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/default_shell_app_window_controller.h"
7 #include "apps/shell/browser/shell_desktop_controller.h" 8 #include "apps/shell/browser/shell_desktop_controller.h"
8 #include "apps/shell/browser/shell_extension_system.h" 9 #include "apps/shell/browser/shell_extension_system.h"
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/file_util.h" 11 #include "base/file_util.h"
11 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
12 13
13 namespace apps { 14 namespace apps {
14 15
15 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { 16 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
16 } 17 }
(...skipping 18 matching lines...) Expand all
35 } else { 36 } else {
36 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future"; 37 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future";
37 } 38 }
38 } 39 }
39 40
40 void DefaultShellBrowserMainDelegate::Shutdown() { 41 void DefaultShellBrowserMainDelegate::Shutdown() {
41 } 42 }
42 43
43 ShellDesktopController* 44 ShellDesktopController*
44 DefaultShellBrowserMainDelegate::CreateDesktopController() { 45 DefaultShellBrowserMainDelegate::CreateDesktopController() {
45 return new ShellDesktopController(); 46 ShellDesktopController* desktop = new ShellDesktopController();
47 desktop->SetAppWindowController(new DefaultShellAppWindowController(desktop));
48 return desktop;
46 } 49 }
47 50
48 } // namespace apps 51 } // namespace apps
OLDNEW
« no previous file with comments | « apps/shell/browser/default_shell_app_window_controller.cc ('k') | apps/shell/browser/shell_app_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698