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

Side by Side Diff: chrome/browser/ui/tab_helpers.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/tab_helpers.h" 5 #include "chrome/browser/ui/tab_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/extensions/tab_helper.h" 10 #include "chrome/browser/extensions/tab_helper.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 #if defined(OS_WIN) 58 #if defined(OS_WIN)
59 #include "chrome/browser/ui/metro_pin_tab_helper_win.h" 59 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
60 #endif 60 #endif
61 61
62 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 62 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
63 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 63 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
64 #endif 64 #endif
65 65
66 #if defined(ENABLE_MANAGED_USERS) 66 #if defined(ENABLE_MANAGED_USERS)
67 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h" 67 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"
68 #endif 68 #endif
69 69
70 #if defined(ENABLE_PRINTING) 70 #if defined(ENABLE_PRINTING)
71 #if defined(ENABLE_FULL_PRINTING) 71 #if defined(ENABLE_FULL_PRINTING)
72 #include "chrome/browser/printing/print_preview_message_handler.h" 72 #include "chrome/browser/printing/print_preview_message_handler.h"
73 #include "chrome/browser/printing/print_view_manager.h" 73 #include "chrome/browser/printing/print_view_manager.h"
74 #else 74 #else
75 #include "chrome/browser/printing/print_view_manager_basic.h" 75 #include "chrome/browser/printing/print_view_manager_basic.h"
76 #endif // defined(ENABLE_FULL_PRINTING) 76 #endif // defined(ENABLE_FULL_PRINTING)
77 #endif // defined(ENABLE_PRINTING) 77 #endif // defined(ENABLE_PRINTING)
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 MetroPinTabHelper::CreateForWebContents(web_contents); 169 MetroPinTabHelper::CreateForWebContents(web_contents);
170 #endif 170 #endif
171 171
172 // --- Feature tab helpers behind flags --- 172 // --- Feature tab helpers behind flags ---
173 173
174 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 174 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
175 CaptivePortalTabHelper::CreateForWebContents(web_contents); 175 CaptivePortalTabHelper::CreateForWebContents(web_contents);
176 #endif 176 #endif
177 177
178 #if defined(ENABLE_MANAGED_USERS) 178 #if defined(ENABLE_MANAGED_USERS)
179 ManagedModeNavigationObserver::CreateForWebContents(web_contents); 179 SupervisedUserNavigationObserver::CreateForWebContents(web_contents);
180 #endif 180 #endif
181 181
182 #if defined(ENABLE_PRINTING) && !defined(OS_ANDROID) 182 #if defined(ENABLE_PRINTING) && !defined(OS_ANDROID)
183 #if defined(ENABLE_FULL_PRINTING) 183 #if defined(ENABLE_FULL_PRINTING)
184 printing::PrintViewManager::CreateForWebContents(web_contents); 184 printing::PrintViewManager::CreateForWebContents(web_contents);
185 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents); 185 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
186 #else 186 #else
187 printing::PrintViewManagerBasic::CreateForWebContents(web_contents); 187 printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
188 #endif // defined(ENABLE_FULL_PRINTING) 188 #endif // defined(ENABLE_FULL_PRINTING)
189 #endif // defined(ENABLE_PRINTING) && !defined(OS_ANDROID) 189 #endif // defined(ENABLE_PRINTING) && !defined(OS_ANDROID)
(...skipping 13 matching lines...) Expand all
203 if (OneClickSigninHelper::CanOffer(web_contents, 203 if (OneClickSigninHelper::CanOffer(web_contents,
204 OneClickSigninHelper::CAN_OFFER_FOR_ALL, 204 OneClickSigninHelper::CAN_OFFER_FOR_ALL,
205 std::string(), 205 std::string(),
206 NULL)) { 206 NULL)) {
207 OneClickSigninHelper::CreateForWebContentsWithPasswordManager( 207 OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
208 web_contents, 208 web_contents,
209 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents)); 209 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents));
210 } 210 }
211 #endif 211 #endif
212 } 212 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc ('k') | chrome/browser/ui/webui/downloads_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698