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

Side by Side Diff: content/shell/shell_main_delegate.cc

Issue 10910209: Add new PathService paths for Windows' All Users Desktop and Quick Launch folders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac compile Created 8 years, 3 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
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 "content/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/base_paths.h"
7 #include "base/command_line.h" 8 #include "base/command_line.h"
8 #include "base/file_path.h" 9 #include "base/file_path.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/path_service.h" 11 #include "base/path_service.h"
11 #include "content/public/browser/browser_main_runner.h" 12 #include "content/public/browser/browser_main_runner.h"
12 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
13 #include "content/public/common/url_constants.h" 14 #include "content/public/common/url_constants.h"
14 #include "content/shell/shell_browser_main.h" 15 #include "content/shell/shell_browser_main.h"
15 #include "content/shell/shell_content_browser_client.h" 16 #include "content/shell/shell_content_browser_client.h"
16 #include "content/shell/shell_content_renderer_client.h" 17 #include "content/shell/shell_content_renderer_client.h"
17 #include "content/shell/shell_switches.h" 18 #include "content/shell/shell_switches.h"
18 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
19 #include "net/http/http_stream_factory.h" 20 #include "net/http/http_stream_factory.h"
20 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/base/ui_base_paths.h" 22 #include "ui/base/ui_base_paths.h"
22 23
23 #if defined(OS_ANDROID) 24 #if defined(OS_ANDROID)
25 #include "base/base_paths_android.h"
24 #include "base/global_descriptors_posix.h" 26 #include "base/global_descriptors_posix.h"
25 #include "content/shell/android/shell_descriptors.h" 27 #include "content/shell/android/shell_descriptors.h"
26 #endif 28 #endif
27 29
28 #if defined(OS_MACOSX) 30 #if defined(OS_MACOSX)
29 #include "content/shell/paths_mac.h" 31 #include "content/shell/paths_mac.h"
30 #endif // OS_MACOSX 32 #endif // OS_MACOSX
31 33
32 #if defined(OS_WIN) 34 #if defined(OS_WIN)
33 #include "base/logging_win.h" 35 #include "base/logging_win.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 browser_client_.reset(new ShellContentBrowserClient); 165 browser_client_.reset(new ShellContentBrowserClient);
164 return browser_client_.get(); 166 return browser_client_.get();
165 } 167 }
166 168
167 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 169 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
168 renderer_client_.reset(new ShellContentRendererClient); 170 renderer_client_.reset(new ShellContentRendererClient);
169 return renderer_client_.get(); 171 return renderer_client_.get();
170 } 172 }
171 173
172 } // namespace content 174 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698