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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_guest.h

Issue 787813004: Move ZoomController out of ChromeWebViewGuestDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix attach logic in GuestViewBase::DidAttach(). Created 6 years 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 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 5 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
6 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 6 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 changed(false) {} 366 changed(false) {}
367 }; 367 };
368 368
369 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap; 369 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
370 PendingWindowMap pending_new_windows_; 370 PendingWindowMap pending_new_windows_;
371 371
372 // This is used to ensure pending tasks will not fire after this object is 372 // This is used to ensure pending tasks will not fire after this object is
373 // destroyed. 373 // destroyed.
374 base::WeakPtrFactory<WebViewGuest> weak_ptr_factory_; 374 base::WeakPtrFactory<WebViewGuest> weak_ptr_factory_;
375 375
376 // Stores the current zoom factor.
377 double current_zoom_factor_;
Fady Samuel 2014/12/09 20:09:47 Above weak_ptr_factory_
wjmaclean 2014/12/09 20:50:04 Thanks, missed that!
378
376 DISALLOW_COPY_AND_ASSIGN(WebViewGuest); 379 DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
377 }; 380 };
378 381
379 } // namespace extensions 382 } // namespace extensions
380 383
381 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 384 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698