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

Side by Side Diff: chrome/utility/chrome_content_utility_client.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
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | content/app/content_main.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 "chrome/utility/chrome_content_utility_client.h" 5 #include "chrome/utility/chrome_content_utility_client.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 14 matching lines...) Expand all
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
26 #include "webkit/glue/image_decoder.h" 26 #include "webkit/glue/image_decoder.h"
27 27
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 #include "base/file_util.h" 29 #include "base/file_util.h"
30 #include "base/memory/scoped_ptr.h" 30 #include "base/memory/scoped_ptr.h"
31 #include "base/path_service.h" 31 #include "base/path_service.h"
32 #include "base/win/iat_patch_function.h" 32 #include "base/win/iat_patch_function.h"
33 #include "base/win/scoped_handle.h" 33 #include "base/win/scoped_handle.h"
34 #include "content/common/child_process_messages.h" 34 #include "content/common/child_process_messages.h"
35 #include "content/common/content_switches.h"
36 #include "content/common/sandbox_init_wrapper.h" 35 #include "content/common/sandbox_init_wrapper.h"
36 #include "content/public/common/content_switches.h"
37 #include "printing/emf_win.h" 37 #include "printing/emf_win.h"
38 #endif // defined(OS_WIN) 38 #endif // defined(OS_WIN)
39 39
40 namespace chrome { 40 namespace chrome {
41 41
42 ChromeContentUtilityClient::ChromeContentUtilityClient() : items_to_import_(0) { 42 ChromeContentUtilityClient::ChromeContentUtilityClient() : items_to_import_(0) {
43 } 43 }
44 44
45 ChromeContentUtilityClient::~ChromeContentUtilityClient() { 45 ChromeContentUtilityClient::~ChromeContentUtilityClient() {
46 } 46 }
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 414
415 void ChromeContentUtilityClient::ImporterCleanup() { 415 void ChromeContentUtilityClient::ImporterCleanup() {
416 importer_->Cancel(); 416 importer_->Cancel();
417 importer_ = NULL; 417 importer_ = NULL;
418 bridge_ = NULL; 418 bridge_ = NULL;
419 import_thread_.reset(); 419 import_thread_.reset();
420 UtilityThread::current()->ReleaseProcessIfNeeded(); 420 UtilityThread::current()->ReleaseProcessIfNeeded();
421 } 421 }
422 422
423 } // namespace chrome 423 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | content/app/content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698