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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete access of ZoomController from WebUILoginView. Created 6 years, 2 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
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/chromeos/login/ui/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 16 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
18 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h" 18 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
19 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 19 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
20 #include "chrome/browser/chromeos/profiles/profile_helper.h" 20 #include "chrome/browser/chromeos/profiles/profile_helper.h"
21 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 21 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
22 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 22 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
23 #include "chrome/browser/media/media_stream_infobar_delegate.h" 23 #include "chrome/browser/media/media_stream_infobar_delegate.h"
24 #include "chrome/browser/password_manager/chrome_password_manager_client.h" 24 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
25 #include "chrome/browser/renderer_preferences_util.h" 25 #include "chrome/browser/renderer_preferences_util.h"
26 #include "chrome/browser/sessions/session_tab_helper.h" 26 #include "chrome/browser/sessions/session_tab_helper.h"
27 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" 27 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
28 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 28 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
29 #include "chrome/browser/ui/zoom/zoom_controller.h"
29 #include "chrome/common/render_messages.h" 30 #include "chrome/common/render_messages.h"
30 #include "chromeos/dbus/dbus_thread_manager.h" 31 #include "chromeos/dbus/dbus_thread_manager.h"
31 #include "chromeos/dbus/session_manager_client.h" 32 #include "chromeos/dbus/session_manager_client.h"
32 #include "chromeos/network/network_state.h" 33 #include "chromeos/network/network_state.h"
33 #include "chromeos/network/network_state_handler.h" 34 #include "chromeos/network/network_state_handler.h"
34 #include "components/password_manager/core/browser/password_manager.h" 35 #include "components/password_manager/core/browser/password_manager.h"
35 #include "components/web_modal/web_contents_modal_dialog_manager.h" 36 #include "components/web_modal/web_contents_modal_dialog_manager.h"
36 #include "content/public/browser/notification_service.h" 37 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/render_frame_host.h" 38 #include "content/public/browser/render_frame_host.h"
38 #include "content/public/browser/render_view_host.h" 39 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/render_widget_host_view.h" 40 #include "content/public/browser/render_widget_host_view.h"
40 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
41 #include "content/public/browser/web_ui.h" 42 #include "content/public/browser/web_ui.h"
43 #include "content/public/common/renderer_preferences.h"
42 #include "third_party/WebKit/public/web/WebInputEvent.h" 44 #include "third_party/WebKit/public/web/WebInputEvent.h"
43 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
44 #include "ui/gfx/size.h" 46 #include "ui/gfx/size.h"
45 #include "ui/views/controls/webview/webview.h" 47 #include "ui/views/controls/webview/webview.h"
46 #include "ui/views/widget/widget.h" 48 #include "ui/views/widget/widget.h"
47 49
48 using content::NativeWebKeyboardEvent; 50 using content::NativeWebKeyboardEvent;
49 using content::RenderViewHost; 51 using content::RenderViewHost;
50 using content::WebContents; 52 using content::WebContents;
51 using web_modal::WebContentsModalDialogManager; 53 using web_modal::WebContentsModalDialogManager;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 WebContentsModalDialogManager::FromWebContents(web_contents)-> 202 WebContentsModalDialogManager::FromWebContents(web_contents)->
201 SetDelegate(this); 203 SetDelegate(this);
202 if (!popup_manager_.get()) 204 if (!popup_manager_.get())
203 popup_manager_.reset(new web_modal::PopupManager(this)); 205 popup_manager_.reset(new web_modal::PopupManager(this));
204 popup_manager_->RegisterWith(web_contents); 206 popup_manager_->RegisterWith(web_contents);
205 207
206 web_contents->SetDelegate(this); 208 web_contents->SetDelegate(this);
207 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( 209 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
208 web_contents); 210 web_contents);
209 WebContentsObserver::Observe(web_contents); 211 WebContentsObserver::Observe(web_contents);
212 content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
210 renderer_preferences_util::UpdateFromSystemSettings( 213 renderer_preferences_util::UpdateFromSystemSettings(
211 web_contents->GetMutableRendererPrefs(), 214 prefs, signin_profile, web_contents);
212 signin_profile);
213 } 215 }
214 216
215 const char* WebUILoginView::GetClassName() const { 217 const char* WebUILoginView::GetClassName() const {
216 return kViewClassName; 218 return kViewClassName;
217 } 219 }
218 220
219 void WebUILoginView::RequestFocus() { 221 void WebUILoginView::RequestFocus() {
220 webui_login_->RequestFocus(); 222 webui_login_->RequestFocus();
221 } 223 }
222 224
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 webui_visible_ = true; 498 webui_visible_ = true;
497 } 499 }
498 500
499 void WebUILoginView::ReturnFocus(bool reverse) { 501 void WebUILoginView::ReturnFocus(bool reverse) {
500 // Return the focus to the web contents. 502 // Return the focus to the web contents.
501 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 503 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
502 GetWidget()->Activate(); 504 GetWidget()->Activate();
503 } 505 }
504 506
505 } // namespace chromeos 507 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/signin/merge_session_load_page.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698