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

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

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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/shell_main.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 11 matching lines...) Expand all
22 #include "content/shell/browser/shell_net_log.h" 22 #include "content/shell/browser/shell_net_log.h"
23 #include "net/base/net_module.h" 23 #include "net/base/net_module.h"
24 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
25 #include "ui/aura/root_window.h" 25 #include "ui/aura/root_window.h"
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/base/ui_base_paths.h" 28 #include "ui/base/ui_base_paths.h"
29 #include "ui/compositor/compositor.h" 29 #include "ui/compositor/compositor.h"
30 #include "ui/gfx/screen.h" 30 #include "ui/gfx/screen.h"
31 #include "ui/message_center/message_center.h" 31 #include "ui/message_center/message_center.h"
32 #include "ui/views/corewm/wm_state.h"
32 #include "ui/views/focus/accelerator_handler.h" 33 #include "ui/views/focus/accelerator_handler.h"
33 #include "ui/views/test/test_views_delegate.h" 34 #include "ui/views/test/test_views_delegate.h"
34 35
35 #if defined(USE_X11) 36 #if defined(USE_X11)
36 #include "ui/events/x/touch_factory_x11.h" 37 #include "ui/events/x/touch_factory_x11.h"
37 #endif 38 #endif
38 39
39 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
40 #include "chromeos/audio/cras_audio_handler.h" 41 #include "chromeos/audio/cras_audio_handler.h"
41 #include "chromeos/dbus/dbus_thread_manager.h" 42 #include "chromeos/dbus/dbus_thread_manager.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); 91 ui::TouchFactory::SetTouchDeviceListFromCommandLine();
91 #endif 92 #endif
92 } 93 }
93 94
94 void ShellBrowserMainParts::PostMainMessageLoopStart() { 95 void ShellBrowserMainParts::PostMainMessageLoopStart() {
95 #if defined(OS_CHROMEOS) 96 #if defined(OS_CHROMEOS)
96 chromeos::DBusThreadManager::Initialize(); 97 chromeos::DBusThreadManager::Initialize();
97 #endif 98 #endif
98 } 99 }
99 100
101 void ShellBrowserMainParts::ToolkitInitialized() {
102 wm_state_.reset(new views::corewm::WMState);
103 }
104
100 void ShellBrowserMainParts::PreMainMessageLoopRun() { 105 void ShellBrowserMainParts::PreMainMessageLoopRun() {
101 net_log_.reset(new content::ShellNetLog()); 106 net_log_.reset(new content::ShellNetLog());
102 browser_context_.reset(new content::ShellBrowserContext( 107 browser_context_.reset(new content::ShellBrowserContext(
103 false, net_log_.get())); 108 false, net_log_.get()));
104 109
105 // A ViewsDelegate is required. 110 // A ViewsDelegate is required.
106 if (!views::ViewsDelegate::views_delegate) 111 if (!views::ViewsDelegate::views_delegate)
107 views::ViewsDelegate::views_delegate = new ShellViewsDelegate; 112 views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
108 113
109 delegate_ = new ash::shell::ShellDelegateImpl; 114 delegate_ = new ash::shell::ShellDelegateImpl;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 browser_context_.reset(); 166 browser_context_.reset();
162 } 167 }
163 168
164 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
165 base::MessageLoopForUI::current()->Run(); 170 base::MessageLoopForUI::current()->Run();
166 return true; 171 return true;
167 } 172 }
168 173
169 } // namespace shell 174 } // namespace shell
170 } // namespace ash 175 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.h ('k') | ash/shell/shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698