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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | « ash/shell/content_client/shell_browser_main_parts.h ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell/shell_delegate_impl.h" 10 #include "ash/shell/shell_delegate_impl.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #endif 91 #endif
92 } 92 }
93 93
94 void ShellBrowserMainParts::PostMainMessageLoopStart() { 94 void ShellBrowserMainParts::PostMainMessageLoopStart() {
95 #if defined(OS_CHROMEOS) 95 #if defined(OS_CHROMEOS)
96 chromeos::DBusThreadManager::Initialize(); 96 chromeos::DBusThreadManager::Initialize();
97 #endif 97 #endif
98 } 98 }
99 99
100 void ShellBrowserMainParts::ToolkitInitialized() { 100 void ShellBrowserMainParts::ToolkitInitialized() {
101 wm_state_.reset(new views::corewm::WMState); 101 wm_state_.reset(new wm::WMState);
102 } 102 }
103 103
104 void ShellBrowserMainParts::PreMainMessageLoopRun() { 104 void ShellBrowserMainParts::PreMainMessageLoopRun() {
105 net_log_.reset(new content::ShellNetLog("ash_shell")); 105 net_log_.reset(new content::ShellNetLog("ash_shell"));
106 browser_context_.reset(new content::ShellBrowserContext( 106 browser_context_.reset(new content::ShellBrowserContext(
107 false, net_log_.get())); 107 false, net_log_.get()));
108 108
109 // A ViewsDelegate is required. 109 // A ViewsDelegate is required.
110 if (!views::ViewsDelegate::views_delegate) 110 if (!views::ViewsDelegate::views_delegate)
111 views::ViewsDelegate::views_delegate = new ShellViewsDelegate; 111 views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 browser_context_.reset(); 165 browser_context_.reset();
166 } 166 }
167 167
168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
169 base::MessageLoopForUI::current()->Run(); 169 base::MessageLoopForUI::current()->Run();
170 return true; 170 return true;
171 } 171 }
172 172
173 } // namespace shell 173 } // namespace shell
174 } // namespace ash 174 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.h ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698