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

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

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
148 #include "components/breakpad/app/breakpad_mac.h" 148 #include "components/breakpad/app/breakpad_mac.h"
149 #elif defined(OS_CHROMEOS) 149 #elif defined(OS_CHROMEOS)
150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
151 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 151 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
152 #include "chrome/browser/chromeos/file_manager/app_id.h" 152 #include "chrome/browser/chromeos/file_manager/app_id.h"
153 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 153 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
154 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 154 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
155 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 155 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
156 #include "chrome/browser/chromeos/login/startup_utils.h" 156 #include "chrome/browser/chromeos/login/startup_utils.h"
157 #include "chrome/browser/chromeos/login/users/user_manager.h"
158 #include "chrome/browser/chromeos/system/input_device_settings.h" 157 #include "chrome/browser/chromeos/system/input_device_settings.h"
159 #include "chromeos/chromeos_switches.h" 158 #include "chromeos/chromeos_switches.h"
159 #include "components/user_manager/user_manager.h"
160 #elif defined(OS_LINUX) 160 #elif defined(OS_LINUX)
161 #include "chrome/browser/chrome_browser_main_linux.h" 161 #include "chrome/browser/chrome_browser_main_linux.h"
162 #elif defined(OS_ANDROID) 162 #elif defined(OS_ANDROID)
163 #include "chrome/browser/android/new_tab_page_url_handler.h" 163 #include "chrome/browser/android/new_tab_page_url_handler.h"
164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
165 #include "chrome/browser/chrome_browser_main_android.h" 165 #include "chrome/browser/chrome_browser_main_android.h"
166 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 166 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
167 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 167 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
168 #include "chrome/common/descriptors_android.h" 168 #include "chrome/common/descriptors_android.h"
169 #include "components/breakpad/browser/crash_dump_manager_android.h" 169 #include "components/breakpad/browser/crash_dump_manager_android.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 } 383 }
384 384
385 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL( 385 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(
386 browser_context, *url)) 386 browser_context, *url))
387 return false; 387 return false;
388 388
389 #if defined(OS_CHROMEOS) 389 #if defined(OS_CHROMEOS)
390 // Special case : in ChromeOS in Guest mode bookmarks and history are 390 // Special case : in ChromeOS in Guest mode bookmarks and history are
391 // disabled for security reasons. New tab page explains the reasons, so 391 // disabled for security reasons. New tab page explains the reasons, so
392 // we redirect user to new tab page. 392 // we redirect user to new tab page.
393 if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) { 393 if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
394 if (url->SchemeIs(content::kChromeUIScheme) && 394 if (url->SchemeIs(content::kChromeUIScheme) &&
395 (url->DomainIs(chrome::kChromeUIBookmarksHost) || 395 (url->DomainIs(chrome::kChromeUIBookmarksHost) ||
396 url->DomainIs(chrome::kChromeUIHistoryHost))) { 396 url->DomainIs(chrome::kChromeUIHistoryHost))) {
397 // Rewrite with new tab URL 397 // Rewrite with new tab URL
398 *url = GURL(chrome::kChromeUINewTabURL); 398 *url = GURL(chrome::kChromeUINewTabURL);
399 } 399 }
400 } 400 }
401 #endif 401 #endif
402 402
403 return true; 403 return true;
(...skipping 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 switches::kDisableWebRtcEncryption, 2639 switches::kDisableWebRtcEncryption,
2640 }; 2640 };
2641 to_command_line->CopySwitchesFrom(from_command_line, 2641 to_command_line->CopySwitchesFrom(from_command_line,
2642 kWebRtcDevSwitchNames, 2642 kWebRtcDevSwitchNames,
2643 arraysize(kWebRtcDevSwitchNames)); 2643 arraysize(kWebRtcDevSwitchNames));
2644 } 2644 }
2645 } 2645 }
2646 #endif // defined(ENABLE_WEBRTC) 2646 #endif // defined(ENABLE_WEBRTC)
2647 2647
2648 } // namespace chrome 2648 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_field_trials_desktop.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698