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

Side by Side Diff: extensions/browser/app_window/app_window.h

Issue 744663002: Fix WeakPtrFactory member ordering in extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporated changes 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_APP_WINDOW_APP_WINDOW_H_ 5 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_ 6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 502
503 scoped_ptr<NativeAppWindow> native_app_window_; 503 scoped_ptr<NativeAppWindow> native_app_window_;
504 scoped_ptr<AppWindowContents> app_window_contents_; 504 scoped_ptr<AppWindowContents> app_window_contents_;
505 scoped_ptr<AppDelegate> app_delegate_; 505 scoped_ptr<AppDelegate> app_delegate_;
506 scoped_ptr<AppWebContentsHelper> helper_; 506 scoped_ptr<AppWebContentsHelper> helper_;
507 507
508 // Manages popup windows (bubbles, tab-modals) visible overlapping the 508 // Manages popup windows (bubbles, tab-modals) visible overlapping the
509 // app window. 509 // app window.
510 scoped_ptr<web_modal::PopupManager> popup_manager_; 510 scoped_ptr<web_modal::PopupManager> popup_manager_;
511 511
512 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_;
513
514 // Bit field of FullscreenType. 512 // Bit field of FullscreenType.
515 int fullscreen_types_; 513 int fullscreen_types_;
516 514
517 // Show has been called, so the window should be shown once the first visually 515 // Show has been called, so the window should be shown once the first visually
518 // non-empty paint occurs. 516 // non-empty paint occurs.
519 bool show_on_first_paint_; 517 bool show_on_first_paint_;
520 518
521 // The first visually non-empty paint has completed. 519 // The first visually non-empty paint has completed.
522 bool first_paint_complete_; 520 bool first_paint_complete_;
523 521
(...skipping 17 matching lines...) Expand all
541 // Cache the desired value of the always-on-top property. When windows enter 539 // Cache the desired value of the always-on-top property. When windows enter
542 // fullscreen or overlap the Windows taskbar, this property will be 540 // fullscreen or overlap the Windows taskbar, this property will be
543 // automatically and silently switched off for security reasons. It is 541 // automatically and silently switched off for security reasons. It is
544 // reinstated when the window exits fullscreen and moves away from the 542 // reinstated when the window exits fullscreen and moves away from the
545 // taskbar. 543 // taskbar.
546 bool cached_always_on_top_; 544 bool cached_always_on_top_;
547 545
548 // Whether |alpha_enabled| was set in the CreateParams. 546 // Whether |alpha_enabled| was set in the CreateParams.
549 bool requested_alpha_enabled_; 547 bool requested_alpha_enabled_;
550 548
549 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_;
550
551 DISALLOW_COPY_AND_ASSIGN(AppWindow); 551 DISALLOW_COPY_AND_ASSIGN(AppWindow);
552 }; 552 };
553 553
554 } // namespace extensions 554 } // namespace extensions
555 555
556 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_ 556 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
OLDNEW
« no previous file with comments | « extensions/browser/api/declarative/rules_registry.cc ('k') | extensions/browser/app_window/app_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698