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 "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "chrome/browser/sessions/session_id.h" | 10 #include "chrome/browser/sessions/session_id.h" |
| 11 #include "components/web_modal/popup_manager.h" |
11 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" | 12 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" |
12 #include "content/public/browser/notification_observer.h" | 13 #include "content/public/browser/notification_observer.h" |
13 #include "content/public/browser/notification_registrar.h" | 14 #include "content/public/browser/notification_registrar.h" |
14 #include "content/public/browser/web_contents_delegate.h" | 15 #include "content/public/browser/web_contents_delegate.h" |
15 #include "content/public/browser/web_contents_observer.h" | 16 #include "content/public/browser/web_contents_observer.h" |
16 #include "content/public/common/console_message_level.h" | 17 #include "content/public/common/console_message_level.h" |
17 #include "extensions/browser/extension_icon_image.h" | 18 #include "extensions/browser/extension_icon_image.h" |
18 #include "ui/base/ui_base_types.h" // WindowShowState | 19 #include "ui/base/ui_base_types.h" // WindowShowState |
19 #include "ui/gfx/image/image.h" | 20 #include "ui/gfx/image/image.h" |
20 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 // URL to be used for setting the badge on the app icon. | 516 // URL to be used for setting the badge on the app icon. |
516 GURL badge_icon_url_; | 517 GURL badge_icon_url_; |
517 | 518 |
518 // An object to load the badge as an extension resource. | 519 // An object to load the badge as an extension resource. |
519 scoped_ptr<extensions::IconImage> badge_icon_image_; | 520 scoped_ptr<extensions::IconImage> badge_icon_image_; |
520 | 521 |
521 scoped_ptr<NativeAppWindow> native_app_window_; | 522 scoped_ptr<NativeAppWindow> native_app_window_; |
522 scoped_ptr<AppWindowContents> app_window_contents_; | 523 scoped_ptr<AppWindowContents> app_window_contents_; |
523 scoped_ptr<Delegate> delegate_; | 524 scoped_ptr<Delegate> delegate_; |
524 | 525 |
| 526 // Manages popup windows (bubbles, tab-modals) visible overlapping the |
| 527 // app window. |
| 528 scoped_ptr<web_modal::PopupManager> popup_manager_; |
| 529 |
525 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_; | 530 base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_; |
526 | 531 |
527 // Bit field of FullscreenType. | 532 // Bit field of FullscreenType. |
528 int fullscreen_types_; | 533 int fullscreen_types_; |
529 | 534 |
530 // Show has been called, so the window should be shown once the first visually | 535 // Show has been called, so the window should be shown once the first visually |
531 // non-empty paint occurs. | 536 // non-empty paint occurs. |
532 bool show_on_first_paint_; | 537 bool show_on_first_paint_; |
533 | 538 |
534 // The first visually non-empty paint has completed. | 539 // The first visually non-empty paint has completed. |
(...skipping 22 matching lines...) Expand all Loading... |
557 // reinstated when the window exits fullscreen and moves away from the | 562 // reinstated when the window exits fullscreen and moves away from the |
558 // taskbar. | 563 // taskbar. |
559 bool cached_always_on_top_; | 564 bool cached_always_on_top_; |
560 | 565 |
561 DISALLOW_COPY_AND_ASSIGN(AppWindow); | 566 DISALLOW_COPY_AND_ASSIGN(AppWindow); |
562 }; | 567 }; |
563 | 568 |
564 } // namespace apps | 569 } // namespace apps |
565 | 570 |
566 #endif // APPS_APP_WINDOW_H_ | 571 #endif // APPS_APP_WINDOW_H_ |
OLD | NEW |