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

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

Issue 138223004: Inject GPUDataManager support into ash to abstract a content dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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.cc ('k') | ash/system/monitor/tray_monitor.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/content_support/inject.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 10 #include "ash/shell.h"
10 #include "ash/shell/shell_delegate_impl.h" 11 #include "ash/shell/shell_delegate_impl.h"
11 #include "ash/shell/window_watcher.h" 12 #include "ash/shell/window_watcher.h"
12 #include "ash/system/user/login_status.h" 13 #include "ash/system/user/login_status.h"
13 #include "base/bind.h" 14 #include "base/bind.h"
14 #include "base/command_line.h" 15 #include "base/command_line.h"
15 #include "base/i18n/icu_util.h" 16 #include "base/i18n/icu_util.h"
16 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
17 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // g_browser_process. 117 // g_browser_process.
117 message_center::MessageCenter::Initialize(); 118 message_center::MessageCenter::Initialize();
118 119
119 #if defined(OS_CHROMEOS) 120 #if defined(OS_CHROMEOS)
120 // Create CrasAudioHandler for testing since g_browser_process 121 // Create CrasAudioHandler for testing since g_browser_process
121 // is absent. 122 // is absent.
122 chromeos::CrasAudioHandler::InitializeForTesting(); 123 chromeos::CrasAudioHandler::InitializeForTesting();
123 #endif 124 #endif
124 125
125 ash::Shell::CreateInstance(delegate_); 126 ash::Shell::CreateInstance(delegate_);
127 ash::InitContentSupport();
126 delegate_->set_browser_context(browser_context_.get()); 128 delegate_->set_browser_context(browser_context_.get());
127 ash::Shell::GetInstance()->CreateShelf(); 129 ash::Shell::GetInstance()->CreateShelf();
128 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( 130 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
129 user::LOGGED_IN_USER); 131 user::LOGGED_IN_USER);
130 132
131 window_watcher_.reset(new ash::shell::WindowWatcher); 133 window_watcher_.reset(new ash::shell::WindowWatcher);
132 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); 134 gfx::Screen* screen = Shell::GetInstance()->GetScreen();
133 screen->AddObserver(window_watcher_.get()); 135 screen->AddObserver(window_watcher_.get());
134 delegate_->SetWatcher(window_watcher_.get()); 136 delegate_->SetWatcher(window_watcher_.get());
135 137
(...skipping 30 matching lines...) Expand all
166 browser_context_.reset(); 168 browser_context_.reset();
167 } 169 }
168 170
169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
170 base::MessageLoopForUI::current()->Run(); 172 base::MessageLoopForUI::current()->Run();
171 return true; 173 return true;
172 } 174 }
173 175
174 } // namespace shell 176 } // namespace shell
175 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/system/monitor/tray_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698