OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/timer/timer.h" | 14 #include "base/timer/timer.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "chrome/browser/devtools/devtools_window.h" | 16 #include "chrome/browser/devtools/devtools_window.h" |
| 17 #include "chrome/browser/signin/signin_header_helper.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
19 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" | 20 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" |
20 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
21 #include "chrome/browser/ui/views/frame/browser_frame.h" | 22 #include "chrome/browser/ui/views/frame/browser_frame.h" |
22 #include "chrome/browser/ui/views/frame/contents_web_view.h" | 23 #include "chrome/browser/ui/views/frame/contents_web_view.h" |
23 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 24 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
24 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h" | 25 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h" |
25 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 26 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
26 #include "chrome/browser/ui/views/load_complete_listener.h" | 27 #include "chrome/browser/ui/views/load_complete_listener.h" |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 virtual void Cut() OVERRIDE; | 355 virtual void Cut() OVERRIDE; |
355 virtual void Copy() OVERRIDE; | 356 virtual void Copy() OVERRIDE; |
356 virtual void Paste() OVERRIDE; | 357 virtual void Paste() OVERRIDE; |
357 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 358 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
358 const gfx::Rect& bounds) OVERRIDE; | 359 const gfx::Rect& bounds) OVERRIDE; |
359 virtual FindBar* CreateFindBar() OVERRIDE; | 360 virtual FindBar* CreateFindBar() OVERRIDE; |
360 virtual web_modal::WebContentsModalDialogHost* | 361 virtual web_modal::WebContentsModalDialogHost* |
361 GetWebContentsModalDialogHost() OVERRIDE; | 362 GetWebContentsModalDialogHost() OVERRIDE; |
362 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 363 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
363 const gfx::Rect& rect) OVERRIDE; | 364 const gfx::Rect& rect) OVERRIDE; |
364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode) OVERRIDE; | 365 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, |
| 366 signin::GAIAServiceType service_type) OVERRIDE; |
365 virtual void ShowPasswordGenerationBubble( | 367 virtual void ShowPasswordGenerationBubble( |
366 const gfx::Rect& rect, | 368 const gfx::Rect& rect, |
367 const autofill::PasswordForm& form, | 369 const autofill::PasswordForm& form, |
368 autofill::PasswordGenerator* password_generator) OVERRIDE; | 370 autofill::PasswordGenerator* password_generator) OVERRIDE; |
369 virtual void OverscrollUpdate(int delta_y) OVERRIDE; | 371 virtual void OverscrollUpdate(int delta_y) OVERRIDE; |
370 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; | 372 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; |
371 virtual void ExecuteExtensionCommand( | 373 virtual void ExecuteExtensionCommand( |
372 const extensions::Extension* extension, | 374 const extensions::Extension* extension, |
373 const extensions::Command& command) OVERRIDE; | 375 const extensions::Command& command) OVERRIDE; |
374 virtual void ShowPageActionPopup( | 376 virtual void ShowPageActionPopup( |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 723 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
722 | 724 |
723 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 725 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
724 | 726 |
725 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 727 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
726 | 728 |
727 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
728 }; | 730 }; |
729 | 731 |
730 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |