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

Side by Side Diff: chrome/browser/local_discovery/privet_http_impl.cc

Issue 1313533003: Fix some extern usage in .cc files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/local_discovery/privet_http_impl.h" 5 #include "chrome/browser/local_discovery/privet_http_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
17 #include "chrome/browser/local_discovery/privet_constants.h" 17 #include "chrome/browser/local_discovery/privet_constants.h"
18 #include "chrome/common/cloud_print/cloud_print_constants.h"
18 #include "net/base/url_util.h" 19 #include "net/base/url_util.h"
19 #include "url/gurl.h" 20 #include "url/gurl.h"
20 21
21 #if defined(ENABLE_PRINT_PREVIEW) 22 #if defined(ENABLE_PRINT_PREVIEW)
22 #include "chrome/browser/local_discovery/pwg_raster_converter.h" 23 #include "chrome/browser/local_discovery/pwg_raster_converter.h"
23 #include "components/cloud_devices/common/printer_description.h" 24 #include "components/cloud_devices/common/printer_description.h"
24 #include "printing/pdf_render_settings.h" 25 #include "printing/pdf_render_settings.h"
25 #include "printing/pwg_raster_settings.h" 26 #include "printing/pwg_raster_settings.h"
26 #include "ui/gfx/text_elider.h" 27 #include "ui/gfx/text_elider.h"
27 #endif // ENABLE_PRINT_PREVIEW 28 #endif // ENABLE_PRINT_PREVIEW
28 29
29 namespace cloud_print {
30 extern const char kContentTypeJSON[];
31 }
32
33 namespace local_discovery { 30 namespace local_discovery {
34 31
35 namespace { 32 namespace {
36 const char kUrlPlaceHolder[] = "http://host/"; 33 const char kUrlPlaceHolder[] = "http://host/";
37 const char kPrivetRegisterActionArgName[] = "action"; 34 const char kPrivetRegisterActionArgName[] = "action";
38 const char kPrivetRegisterUserArgName[] = "user"; 35 const char kPrivetRegisterUserArgName[] = "user";
39 36
40 const int kPrivetCancelationTimeoutSeconds = 3; 37 const int kPrivetCancelationTimeoutSeconds = 3;
41 38
42 #if defined(ENABLE_PRINT_PREVIEW) 39 #if defined(ENABLE_PRINT_PREVIEW)
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 PrivetLocalPrintOperation::Delegate* delegate) { 790 PrivetLocalPrintOperation::Delegate* delegate) {
794 #if defined(ENABLE_PRINT_PREVIEW) 791 #if defined(ENABLE_PRINT_PREVIEW)
795 return scoped_ptr<PrivetLocalPrintOperation>( 792 return scoped_ptr<PrivetLocalPrintOperation>(
796 new PrivetLocalPrintOperationImpl(info_client(), delegate)); 793 new PrivetLocalPrintOperationImpl(info_client(), delegate));
797 #else 794 #else
798 return scoped_ptr<PrivetLocalPrintOperation>(); 795 return scoped_ptr<PrivetLocalPrintOperation>();
799 #endif // ENABLE_PRINT_PREVIEW 796 #endif // ENABLE_PRINT_PREVIEW
800 } 797 }
801 798
802 } // namespace local_discovery 799 } // namespace local_discovery
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698