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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/themes/theme_service_factory.h" 47 #include "chrome/browser/themes/theme_service_factory.h"
48 #include "chrome/browser/ui/chrome_select_file_policy.h" 48 #include "chrome/browser/ui/chrome_select_file_policy.h"
49 #include "chrome/browser/ui/options/options_util.h" 49 #include "chrome/browser/ui/options/options_util.h"
50 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 50 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
51 #include "chrome/browser/ui/webui/favicon_source.h" 51 #include "chrome/browser/ui/webui/favicon_source.h"
52 #include "chrome/browser/ui/webui/web_ui_util.h" 52 #include "chrome/browser/ui/webui/web_ui_util.h"
53 #include "chrome/common/chrome_constants.h" 53 #include "chrome/common/chrome_constants.h"
54 #include "chrome/common/chrome_notification_types.h" 54 #include "chrome/common/chrome_notification_types.h"
55 #include "chrome/common/chrome_paths.h" 55 #include "chrome/common/chrome_paths.h"
56 #include "chrome/common/chrome_switches.h" 56 #include "chrome/common/chrome_switches.h"
57 #include "chrome/common/net/gaia/google_service_auth_error.h"
58 #include "chrome/common/pref_names.h" 57 #include "chrome/common/pref_names.h"
59 #include "chrome/common/url_constants.h" 58 #include "chrome/common/url_constants.h"
60 #include "content/public/browser/browser_thread.h" 59 #include "content/public/browser/browser_thread.h"
61 #include "content/public/browser/download_manager.h" 60 #include "content/public/browser/download_manager.h"
62 #include "content/public/browser/navigation_controller.h" 61 #include "content/public/browser/navigation_controller.h"
63 #include "content/public/browser/notification_details.h" 62 #include "content/public/browser/notification_details.h"
64 #include "content/public/browser/notification_service.h" 63 #include "content/public/browser/notification_service.h"
65 #include "content/public/browser/notification_source.h" 64 #include "content/public/browser/notification_source.h"
66 #include "content/public/browser/notification_types.h" 65 #include "content/public/browser/notification_types.h"
67 #include "content/public/browser/user_metrics.h" 66 #include "content/public/browser/user_metrics.h"
68 #include "content/public/browser/web_contents.h" 67 #include "content/public/browser/web_contents.h"
69 #include "content/public/browser/web_contents_view.h" 68 #include "content/public/browser/web_contents_view.h"
70 #include "content/public/common/page_zoom.h" 69 #include "content/public/common/page_zoom.h"
70 #include "google_apis/gaia/google_service_auth_error.h"
71 #include "grit/chromium_strings.h" 71 #include "grit/chromium_strings.h"
72 #include "grit/generated_resources.h" 72 #include "grit/generated_resources.h"
73 #include "grit/locale_settings.h" 73 #include "grit/locale_settings.h"
74 #include "grit/theme_resources.h" 74 #include "grit/theme_resources.h"
75 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 75 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
76 #include "ui/base/l10n/l10n_util.h" 76 #include "ui/base/l10n/l10n_util.h"
77 77
78 #if !defined(OS_CHROMEOS) 78 #if !defined(OS_CHROMEOS)
79 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" 79 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
80 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 80 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 } 1458 }
1459 1459
1460 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1460 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1461 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1461 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1462 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1462 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1463 web_ui()->CallJavascriptFunction( 1463 web_ui()->CallJavascriptFunction(
1464 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1464 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1465 } 1465 }
1466 1466
1467 } // namespace options 1467 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698