| OLD | NEW |
| 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 APPS_APP_WINDOW_H_ | 5 #ifndef APPS_APP_WINDOW_H_ |
| 6 #define APPS_APP_WINDOW_H_ | 6 #define APPS_APP_WINDOW_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "chrome/browser/sessions/session_id.h" | 13 #include "chrome/browser/sessions/session_id.h" |
| 14 #include "components/web_modal/popup_manager.h" | |
| 15 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" | 14 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" |
| 16 #include "content/public/browser/notification_observer.h" | 15 #include "content/public/browser/notification_observer.h" |
| 17 #include "content/public/browser/notification_registrar.h" | 16 #include "content/public/browser/notification_registrar.h" |
| 18 #include "content/public/browser/web_contents_delegate.h" | 17 #include "content/public/browser/web_contents_delegate.h" |
| 19 #include "content/public/browser/web_contents_observer.h" | 18 #include "content/public/browser/web_contents_observer.h" |
| 20 #include "extensions/browser/extension_icon_image.h" | 19 #include "extensions/browser/extension_icon_image.h" |
| 21 #include "ui/base/ui_base_types.h" // WindowShowState | 20 #include "ui/base/ui_base_types.h" // WindowShowState |
| 22 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 23 #include "ui/gfx/rect.h" | 22 #include "ui/gfx/rect.h" |
| 24 | 23 |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 GURL badge_icon_url_; | 497 GURL badge_icon_url_; |
| 499 | 498 |
| 500 // An object to load the badge as an extension resource. | 499 // An object to load the badge as an extension resource. |
| 501 scoped_ptr<extensions::IconImage> badge_icon_image_; | 500 scoped_ptr<extensions::IconImage> badge_icon_image_; |
| 502 | 501 |
| 503 scoped_ptr<NativeAppWindow> native_app_window_; | 502 scoped_ptr<NativeAppWindow> native_app_window_; |
| 504 scoped_ptr<AppWindowContents> app_window_contents_; | 503 scoped_ptr<AppWindowContents> app_window_contents_; |
| 505 scoped_ptr<AppDelegate> app_delegate_; | 504 scoped_ptr<AppDelegate> app_delegate_; |
| 506 scoped_ptr<AppWebContentsHelper> helper_; | 505 scoped_ptr<AppWebContentsHelper> helper_; |
| 507 | 506 |
| 508 // Manages popup windows (bubbles, tab-modals) visible overlapping the | |
| 509 // app window. | |
| 510 scoped_ptr<web_modal::PopupManager> popup_manager_; | |
| 511 | |
| 512 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_; | 507 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_; |
| 513 | 508 |
| 514 // Bit field of FullscreenType. | 509 // Bit field of FullscreenType. |
| 515 int fullscreen_types_; | 510 int fullscreen_types_; |
| 516 | 511 |
| 517 // Show has been called, so the window should be shown once the first visually | 512 // Show has been called, so the window should be shown once the first visually |
| 518 // non-empty paint occurs. | 513 // non-empty paint occurs. |
| 519 bool show_on_first_paint_; | 514 bool show_on_first_paint_; |
| 520 | 515 |
| 521 // The first visually non-empty paint has completed. | 516 // The first visually non-empty paint has completed. |
| (...skipping 25 matching lines...) Expand all Loading... |
| 547 | 542 |
| 548 // Whether |alpha_enabled| was set in the CreateParams. | 543 // Whether |alpha_enabled| was set in the CreateParams. |
| 549 bool requested_alpha_enabled_; | 544 bool requested_alpha_enabled_; |
| 550 | 545 |
| 551 DISALLOW_COPY_AND_ASSIGN(AppWindow); | 546 DISALLOW_COPY_AND_ASSIGN(AppWindow); |
| 552 }; | 547 }; |
| 553 | 548 |
| 554 } // namespace apps | 549 } // namespace apps |
| 555 | 550 |
| 556 #endif // APPS_APP_WINDOW_H_ | 551 #endif // APPS_APP_WINDOW_H_ |
| OLD | NEW |