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

Side by Side Diff: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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/ui/webui/local_discovery/local_discovery_ui_handler.h" 5 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 25 matching lines...) Expand all
36 #include "components/signin/core/browser/signin_manager_base.h" 36 #include "components/signin/core/browser/signin_manager_base.h"
37 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
38 #include "content/public/browser/web_ui.h" 38 #include "content/public/browser/web_ui.h"
39 #include "net/base/host_port_pair.h" 39 #include "net/base/host_port_pair.h"
40 #include "net/base/net_util.h" 40 #include "net/base/net_util.h"
41 #include "net/base/url_util.h" 41 #include "net/base/url_util.h"
42 #include "net/http/http_status_code.h" 42 #include "net/http/http_status_code.h"
43 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/page_transition_types.h" 44 #include "ui/base/page_transition_types.h"
45 45
46 #if defined(ENABLE_FULL_PRINTING) && !defined(OS_CHROMEOS) 46 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
47 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE 47 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
48 #endif 48 #endif
49 49
50 namespace local_discovery { 50 namespace local_discovery {
51 51
52 namespace { 52 namespace {
53 53
54 const char kDictionaryKeyServiceName[] = "service_name"; 54 const char kDictionaryKeyServiceName[] = "service_name";
55 const char kDictionaryKeyDisplayName[] = "display_name"; 55 const char kDictionaryKeyDisplayName[] = "display_name";
56 const char kDictionaryKeyDescription[] = "description"; 56 const char kDictionaryKeyDescription[] = "description";
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); 789 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
790 790
791 web_ui()->CallJavascriptFunction( 791 web_ui()->CallJavascriptFunction(
792 "local_discovery.onUnregisteredDeviceUpdate", service_key, *null_value); 792 "local_discovery.onUnregisteredDeviceUpdate", service_key, *null_value);
793 } 793 }
794 } 794 }
795 795
796 #endif // ENABLE_WIFI_BOOTSTRAPPING 796 #endif // ENABLE_WIFI_BOOTSTRAPPING
797 797
798 } // namespace local_discovery 798 } // namespace local_discovery
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698