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

Side by Side Diff: extensions/browser/guest_view/extension_options/extension_options_guest.cc

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
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 "extensions/browser/guest_view/extension_options/extension_options_gues t.h" 5 #include "extensions/browser/guest_view/extension_options/extension_options_gues t.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 false)); 220 false));
221 } 221 }
222 return false; 222 return false;
223 } 223 }
224 224
225 void ExtensionOptionsGuest::DidNavigateMainFrame( 225 void ExtensionOptionsGuest::DidNavigateMainFrame(
226 const content::LoadCommittedDetails& details, 226 const content::LoadCommittedDetails& details,
227 const content::FrameNavigateParams& params) { 227 const content::FrameNavigateParams& params) {
228 if (attached()) { 228 if (attached()) {
229 auto guest_zoom_controller = 229 auto guest_zoom_controller =
230 ui_zoom::ZoomController::FromWebContents(web_contents()); 230 zoom::ZoomController::FromWebContents(web_contents());
231 guest_zoom_controller->SetZoomMode( 231 guest_zoom_controller->SetZoomMode(
232 ui_zoom::ZoomController::ZOOM_MODE_ISOLATED); 232 zoom::ZoomController::ZOOM_MODE_ISOLATED);
233 SetGuestZoomLevelToMatchEmbedder(); 233 SetGuestZoomLevelToMatchEmbedder();
234 234
235 if (!url::IsSameOriginWith(params.url, options_page_)) { 235 if (!url::IsSameOriginWith(params.url, options_page_)) {
236 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), 236 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
237 bad_message::EOG_BAD_ORIGIN); 237 bad_message::EOG_BAD_ORIGIN);
238 } 238 }
239 } 239 }
240 } 240 }
241 241
242 } // namespace extensions 242 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/extension_zoom_request_client.h ('k') | extensions/browser/guest_view/web_view/web_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698