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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « content/shell/shell.cc ('k') | content/test/render_view_fake_resources_test.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_browser_main.h" 5 #include "content/shell/shell_browser_main.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/threading/thread.h" 8 #include "base/threading/thread.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "content/browser/browser_process_sub_thread.h" 10 #include "content/browser/browser_process_sub_thread.h"
11 #include "content/browser/download/download_file_manager.h" 11 #include "content/browser/download/download_file_manager.h"
12 #include "content/browser/download/save_file_manager.h" 12 #include "content/browser/download/save_file_manager.h"
13 #include "content/browser/renderer_host/resource_dispatcher_host.h" 13 #include "content/browser/renderer_host/resource_dispatcher_host.h"
14 #include "content/common/page_transition_types.h"
15 #include "content/shell/shell.h" 14 #include "content/shell/shell.h"
16 #include "content/shell/shell_browser_context.h" 15 #include "content/shell/shell_browser_context.h"
17 #include "content/shell/shell_content_browser_client.h" 16 #include "content/shell/shell_content_browser_client.h"
18 #include "net/base/net_module.h" 17 #include "net/base/net_module.h"
19 #include "ui/base/clipboard/clipboard.h" 18 #include "ui/base/clipboard/clipboard.h"
20 19
21 namespace content { 20 namespace content {
22 21
23 ShellBrowserMainParts::ShellBrowserMainParts( 22 ShellBrowserMainParts::ShellBrowserMainParts(
24 const MainFunctionParams& parameters) 23 const MainFunctionParams& parameters)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return resource_dispatcher_host_.get(); 86 return resource_dispatcher_host_.get();
88 } 87 }
89 88
90 ui::Clipboard* ShellBrowserMainParts::GetClipboard() { 89 ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
91 if (!clipboard_.get()) 90 if (!clipboard_.get())
92 clipboard_.reset(new ui::Clipboard()); 91 clipboard_.reset(new ui::Clipboard());
93 return clipboard_.get(); 92 return clipboard_.get();
94 } 93 }
95 94
96 } // namespace 95 } // namespace
OLDNEW
« no previous file with comments | « content/shell/shell.cc ('k') | content/test/render_view_fake_resources_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698