extensions/shell/browser/default_shell_app_window_controller.cc - Issue 412713002: Move apps/shell to extensions/shell.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: extensions/shell/browser/default_shell_app_window_controller.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 40% Created 6 years, 5 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

« no previous file with comments | « extensions/shell/browser/default_shell_app_window_controller.h ('k') | extensions/shell/browser/default_shell_browser_main_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_app_window_controller.h"	5 #include "extensions/shell/browser/default_shell_app_window_controller.h"

6	6

7 #include "apps/shell/browser/shell_app_window.h"

8 #include "apps/shell/browser/shell_desktop_controller.h"

9 #include "base/logging.h"	7 #include "base/logging.h"

	8 #include "extensions/shell/browser/shell_app_window.h"

	9 #include "extensions/shell/browser/shell_desktop_controller.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

11 #include "ui/aura/window_tree_host.h"	11 #include "ui/aura/window_tree_host.h"

12	12

13 namespace apps {	13 namespace extensions {

14	14

15 DefaultShellAppWindowController::DefaultShellAppWindowController(	15 DefaultShellAppWindowController::DefaultShellAppWindowController(

16 ShellDesktopController* shell_desktop_controller)	16 ShellDesktopController* shell_desktop_controller)

17 : shell_desktop_controller_(shell_desktop_controller) {	17 : shell_desktop_controller_(shell_desktop_controller) {

18 DCHECK(shell_desktop_controller_);	18 DCHECK(shell_desktop_controller_);

19 }	19 }

20	20

21 DefaultShellAppWindowController::~DefaultShellAppWindowController() {	21 DefaultShellAppWindowController::~DefaultShellAppWindowController() {

22 // The app window must be explicitly closed before desktop teardown.	22 // The app window must be explicitly closed before desktop teardown.

23 DCHECK(!app_window_);	23 DCHECK(!app_window_);

(...skipping 11 matching lines...) Expand all Loading...
35 root_window->AddChild(content);	35 root_window->AddChild(content);

36 content->Show();	36 content->Show();

37	37

38 return app_window_.get();	38 return app_window_.get();

39 }	39 }

40	40

41 void DefaultShellAppWindowController::CloseAppWindows() {	41 void DefaultShellAppWindowController::CloseAppWindows() {

42 app_window_.reset();	42 app_window_.reset();

43 }	43 }

44	44

45 } // namespace apps	45 } // namespace extensions

OLD	NEW