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

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

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

Powered by Google App Engine
This is Rietveld 408576698