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

Side by Side Diff: content/browser/in_process_webkit/webkit_thread.cc

Issue 8277018: Move content_switches to content\public\common. (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
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/browser/in_process_webkit/webkit_thread.h" 5 #include "content/browser/in_process_webkit/webkit_thread.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h " 8 #include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h "
9 #include "content/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
12 #include "webkit/glue/webkit_glue.h" 12 #include "webkit/glue/webkit_glue.h"
13 13
14 WebKitThread::WebKitThread() { 14 WebKitThread::WebKitThread() {
15 } 15 }
16 16
17 // This happens on the UI thread after the IO thread has been shut down. 17 // This happens on the UI thread after the IO thread has been shut down.
18 WebKitThread::~WebKitThread() { 18 WebKitThread::~WebKitThread() {
19 // We can't just check CurrentlyOn(BrowserThread::UI) because in unit tests, 19 // We can't just check CurrentlyOn(BrowserThread::UI) because in unit tests,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 WebKit::WebSecurityOrigin::create(GURL("http://chromium.org")); 57 WebKit::WebSecurityOrigin::create(GURL("http://chromium.org"));
58 58
59 // If possible, post initialization tasks to this thread (rather than doing 59 // If possible, post initialization tasks to this thread (rather than doing
60 // them now) so we don't block the UI thread any longer than we have to. 60 // them now) so we don't block the UI thread any longer than we have to.
61 } 61 }
62 62
63 void WebKitThread::InternalWebKitThread::CleanUp() { 63 void WebKitThread::InternalWebKitThread::CleanUp() {
64 DCHECK(webkit_platform_support_.get()); 64 DCHECK(webkit_platform_support_.get());
65 WebKit::shutdown(); 65 WebKit::shutdown();
66 } 66 }
OLDNEW
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_dispatcher_host.cc ('k') | content/browser/intents/intent_injector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698