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

Side by Side Diff: wm/shell/content_client/shell_main_delegate.cc

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Push gfx::AcceleratedWidget usage into platform specific code. Created 7 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 | « wm/shell/content_client/shell_main_delegate.h ('k') | wm/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) 2013 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_main_delegate.h" 5 #include "wm/shell/content_client/shell_main_delegate.h"
6 6
7 #include "ash/shell/content_client/shell_content_browser_client.h" 7 #include <string>
8
8 #include "base/command_line.h" 9 #include "base/command_line.h"
9 #include "base/file_path.h"
10 #include "base/path_service.h"
11 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
12 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/base/ui_base_paths.h" 12 #include "wm/shell/content_client/shell_content_browser_client.h"
14 13
15 namespace ash { 14 namespace wm {
16 namespace shell { 15 namespace shell {
17 16
18 ShellMainDelegate::ShellMainDelegate() { 17 ShellMainDelegate::ShellMainDelegate() {
19 } 18 }
20 19
21 ShellMainDelegate::~ShellMainDelegate() { 20 ShellMainDelegate::~ShellMainDelegate() {
22 } 21 }
23 22
24 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { 23 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
25 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 24 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
(...skipping 12 matching lines...) Expand all
38 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { 37 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
39 browser_client_.reset(new ShellContentBrowserClient); 38 browser_client_.reset(new ShellContentBrowserClient);
40 return browser_client_.get(); 39 return browser_client_.get();
41 } 40 }
42 41
43 void ShellMainDelegate::InitializeResourceBundle() { 42 void ShellMainDelegate::InitializeResourceBundle() {
44 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 43 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
45 } 44 }
46 45
47 } // namespace shell 46 } // namespace shell
48 } // namespace ash 47 } // namespace wm
OLDNEW
« no previous file with comments | « wm/shell/content_client/shell_main_delegate.h ('k') | wm/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698