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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2279163002: cros: Bind password echo with TouchView mode
Patch Set: do not run for mash to fix mash test Created 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.h » ('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) 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 201 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
202 #include "chrome/browser/chromeos/file_manager/app_id.h" 202 #include "chrome/browser/chromeos/file_manager/app_id.h"
203 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 203 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
204 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 204 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
205 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 205 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
206 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle .h" 206 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle .h"
207 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" 207 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"
208 #include "chrome/browser/chromeos/login/startup_utils.h" 208 #include "chrome/browser/chromeos/login/startup_utils.h"
209 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 209 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
210 #include "chrome/browser/chromeos/system/input_device_settings.h" 210 #include "chrome/browser/chromeos/system/input_device_settings.h"
211 #include "chrome/browser/chromeos/ui/password_echo_controller.h"
211 #include "chrome/browser/ui/ash/ash_util.h" 212 #include "chrome/browser/ui/ash/ash_util.h"
212 #include "chrome/browser/ui/browser_dialogs.h" 213 #include "chrome/browser/ui/browser_dialogs.h"
213 #include "chromeos/chromeos_switches.h" 214 #include "chromeos/chromeos_switches.h"
214 #include "components/user_manager/user_manager.h" 215 #include "components/user_manager/user_manager.h"
215 #elif defined(OS_LINUX) 216 #elif defined(OS_LINUX)
216 #include "chrome/browser/chrome_browser_main_linux.h" 217 #include "chrome/browser/chrome_browser_main_linux.h"
217 #elif defined(OS_ANDROID) 218 #elif defined(OS_ANDROID)
218 #include "chrome/browser/chrome_browser_main_android.h" 219 #include "chrome/browser/chrome_browser_main_android.h"
219 #include "chrome/common/descriptors_android.h" 220 #include "chrome/common/descriptors_android.h"
220 #include "components/crash/content/browser/crash_dump_manager_android.h" 221 #include "components/crash/content/browser/crash_dump_manager_android.h"
(...skipping 2174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2395 web_prefs->font_scale_factor = 2396 web_prefs->font_scale_factor =
2396 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); 2397 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor));
2397 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); 2398 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment();
2398 web_prefs->force_enable_zoom = 2399 web_prefs->force_enable_zoom =
2399 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); 2400 prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
2400 #endif 2401 #endif
2401 2402
2402 #if defined(OS_ANDROID) 2403 #if defined(OS_ANDROID)
2403 web_prefs->password_echo_enabled = 2404 web_prefs->password_echo_enabled =
2404 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); 2405 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled);
2406 #elif defined(OS_CHROMEOS)
2407 // PasswordEchoController is null for mash and unit tests.
2408 web_prefs->password_echo_enabled =
2409 chromeos::PasswordEchoController::Get()
2410 ? chromeos::PasswordEchoController::Get()->enabled()
2411 : browser_defaults::kPasswordEchoEnabled;
2405 #else 2412 #else
2406 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; 2413 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
2407 #endif 2414 #endif
2408 2415
2409 web_prefs->uses_universal_detector = 2416 web_prefs->uses_universal_detector =
2410 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); 2417 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
2411 web_prefs->text_areas_are_resizable = 2418 web_prefs->text_areas_are_resizable =
2412 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); 2419 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
2413 web_prefs->hyperlink_auditing_enabled = 2420 web_prefs->hyperlink_auditing_enabled =
2414 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); 2421 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
3154 if (channel <= kMaxDisableEncryptionChannel) { 3161 if (channel <= kMaxDisableEncryptionChannel) {
3155 static const char* const kWebRtcDevSwitchNames[] = { 3162 static const char* const kWebRtcDevSwitchNames[] = {
3156 switches::kDisableWebRtcEncryption, 3163 switches::kDisableWebRtcEncryption,
3157 }; 3164 };
3158 to_command_line->CopySwitchesFrom(from_command_line, 3165 to_command_line->CopySwitchesFrom(from_command_line,
3159 kWebRtcDevSwitchNames, 3166 kWebRtcDevSwitchNames,
3160 arraysize(kWebRtcDevSwitchNames)); 3167 arraysize(kWebRtcDevSwitchNames));
3161 } 3168 }
3162 } 3169 }
3163 #endif // defined(ENABLE_WEBRTC) 3170 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698