ash/shell/content/client/shell_browser_main_parts.cc - Issue 2099793002: mash: Migrate some system user files to common.

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: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup Created 4 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

« ash/root_window_controller.h ('K') | « ash/shell.cc ('k') | ash/system/chromeos/enterprise/tray_enterprise.cc » ('j') | no next file with comments »

OLD	NEW
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 "ash/shell/content/client/shell_browser_main_parts.h"	5 #include "ash/shell/content/client/shell_browser_main_parts.h"

6	6

7 #include "ash/common/ash_switches.h"	7 #include "ash/common/ash_switches.h"

	8 #include "ash/common/login_status.h"

8 #include "ash/common/material_design/material_design_controller.h"	9 #include "ash/common/material_design/material_design_controller.h"

9 #include "ash/content/shell_content_state.h"	10 #include "ash/content/shell_content_state.h"

10 #include "ash/desktop_background/desktop_background_controller.h"	11 #include "ash/desktop_background/desktop_background_controller.h"

11 #include "ash/shell.h"	12 #include "ash/shell.h"

12 #include "ash/shell/content/shell_content_state_impl.h"	13 #include "ash/shell/content/shell_content_state_impl.h"

13 #include "ash/shell/shell_delegate_impl.h"	14 #include "ash/shell/shell_delegate_impl.h"

14 #include "ash/shell/window_watcher.h"	15 #include "ash/shell/window_watcher.h"

15 #include "ash/shell_init_params.h"	16 #include "ash/shell_init_params.h"

16 #include "ash/system/user/login_status.h"

17 #include "base/bind.h"	17 #include "base/bind.h"

18 #include "base/command_line.h"	18 #include "base/command_line.h"

19 #include "base/i18n/icu_util.h"	19 #include "base/i18n/icu_util.h"

20 #include "base/message_loop/message_loop.h"	20 #include "base/message_loop/message_loop.h"

21 #include "base/strings/string_number_conversions.h"	21 #include "base/strings/string_number_conversions.h"

22 #include "base/threading/thread.h"	22 #include "base/threading/thread.h"

23 #include "base/threading/thread_restrictions.h"	23 #include "base/threading/thread_restrictions.h"

24 #include "content/public/browser/browser_thread.h"	24 #include "content/public/browser/browser_thread.h"

25 #include "content/public/browser/context_factory.h"	25 #include "content/public/browser/context_factory.h"

26 #include "content/public/common/content_switches.h"	26 #include "content/public/common/content_switches.h"

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
171 browser_context_.reset();	171 browser_context_.reset();

172 }	172 }

173	173

174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {	174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {

175 base::MessageLoop::current()->Run();	175 base::MessageLoop::current()->Run();

176 return true;	176 return true;

177 }	177 }

178	178

179 } // namespace shell	179 } // namespace shell

180 } // namespace ash	180 } // namespace ash

OLD	NEW