| 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> |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 // Called after the widget's fullscreen state is changed without going through | 240 // Called after the widget's fullscreen state is changed without going through |
| 241 // FullscreenController. This method does any processing which was skipped. | 241 // FullscreenController. This method does any processing which was skipped. |
| 242 // Only exiting fullscreen in this way is currently supported. | 242 // Only exiting fullscreen in this way is currently supported. |
| 243 void FullscreenStateChanged(); | 243 void FullscreenStateChanged(); |
| 244 | 244 |
| 245 // Called from BookmarkBarView/DownloadShelfView during their show/hide | 245 // Called from BookmarkBarView/DownloadShelfView during their show/hide |
| 246 // animations. | 246 // animations. |
| 247 void ToolbarSizeChanged(bool is_animating); | 247 void ToolbarSizeChanged(bool is_animating); |
| 248 | 248 |
| 249 // Overridden from BrowserWindow: | 249 // Overridden from BrowserWindow: |
| 250 virtual void Show() OVERRIDE; | 250 virtual void Show() override; |
| 251 virtual void ShowInactive() OVERRIDE; | 251 virtual void ShowInactive() override; |
| 252 virtual void Hide() OVERRIDE; | 252 virtual void Hide() override; |
| 253 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; | 253 virtual void SetBounds(const gfx::Rect& bounds) override; |
| 254 virtual void Close() OVERRIDE; | 254 virtual void Close() override; |
| 255 virtual void Activate() OVERRIDE; | 255 virtual void Activate() override; |
| 256 virtual void Deactivate() OVERRIDE; | 256 virtual void Deactivate() override; |
| 257 virtual bool IsActive() const OVERRIDE; | 257 virtual bool IsActive() const override; |
| 258 virtual void FlashFrame(bool flash) OVERRIDE; | 258 virtual void FlashFrame(bool flash) override; |
| 259 virtual bool IsAlwaysOnTop() const OVERRIDE; | 259 virtual bool IsAlwaysOnTop() const override; |
| 260 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; | 260 virtual void SetAlwaysOnTop(bool always_on_top) override; |
| 261 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; | 261 virtual gfx::NativeWindow GetNativeWindow() override; |
| 262 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; | 262 virtual BrowserWindowTesting* GetBrowserWindowTesting() override; |
| 263 virtual StatusBubble* GetStatusBubble() OVERRIDE; | 263 virtual StatusBubble* GetStatusBubble() override; |
| 264 virtual void UpdateTitleBar() OVERRIDE; | 264 virtual void UpdateTitleBar() override; |
| 265 virtual void BookmarkBarStateChanged( | 265 virtual void BookmarkBarStateChanged( |
| 266 BookmarkBar::AnimateChangeType change_type) OVERRIDE; | 266 BookmarkBar::AnimateChangeType change_type) override; |
| 267 virtual void UpdateDevTools() OVERRIDE; | 267 virtual void UpdateDevTools() override; |
| 268 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; | 268 virtual void UpdateLoadingAnimations(bool should_animate) override; |
| 269 virtual void SetStarredState(bool is_starred) OVERRIDE; | 269 virtual void SetStarredState(bool is_starred) override; |
| 270 virtual void SetTranslateIconToggled(bool is_lit) OVERRIDE; | 270 virtual void SetTranslateIconToggled(bool is_lit) override; |
| 271 virtual void OnActiveTabChanged(content::WebContents* old_contents, | 271 virtual void OnActiveTabChanged(content::WebContents* old_contents, |
| 272 content::WebContents* new_contents, | 272 content::WebContents* new_contents, |
| 273 int index, | 273 int index, |
| 274 int reason) OVERRIDE; | 274 int reason) override; |
| 275 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE; | 275 virtual void ZoomChangedForActiveTab(bool can_show_bubble) override; |
| 276 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; | 276 virtual gfx::Rect GetRestoredBounds() const override; |
| 277 virtual ui::WindowShowState GetRestoredState() const OVERRIDE; | 277 virtual ui::WindowShowState GetRestoredState() const override; |
| 278 virtual gfx::Rect GetBounds() const OVERRIDE; | 278 virtual gfx::Rect GetBounds() const override; |
| 279 virtual bool IsMaximized() const OVERRIDE; | 279 virtual bool IsMaximized() const override; |
| 280 virtual bool IsMinimized() const OVERRIDE; | 280 virtual bool IsMinimized() const override; |
| 281 virtual void Maximize() OVERRIDE; | 281 virtual void Maximize() override; |
| 282 virtual void Minimize() OVERRIDE; | 282 virtual void Minimize() override; |
| 283 virtual void Restore() OVERRIDE; | 283 virtual void Restore() override; |
| 284 virtual void EnterFullscreen( | 284 virtual void EnterFullscreen( |
| 285 const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE; | 285 const GURL& url, FullscreenExitBubbleType bubble_type) override; |
| 286 virtual void ExitFullscreen() OVERRIDE; | 286 virtual void ExitFullscreen() override; |
| 287 virtual void UpdateFullscreenExitBubbleContent( | 287 virtual void UpdateFullscreenExitBubbleContent( |
| 288 const GURL& url, | 288 const GURL& url, |
| 289 FullscreenExitBubbleType bubble_type) OVERRIDE; | 289 FullscreenExitBubbleType bubble_type) override; |
| 290 virtual bool ShouldHideUIForFullscreen() const OVERRIDE; | 290 virtual bool ShouldHideUIForFullscreen() const override; |
| 291 virtual bool IsFullscreen() const OVERRIDE; | 291 virtual bool IsFullscreen() const override; |
| 292 virtual bool IsFullscreenBubbleVisible() const OVERRIDE; | 292 virtual bool IsFullscreenBubbleVisible() const override; |
| 293 #if defined(OS_WIN) | 293 #if defined(OS_WIN) |
| 294 virtual void SetMetroSnapMode(bool enable) OVERRIDE; | 294 virtual void SetMetroSnapMode(bool enable) override; |
| 295 virtual bool IsInMetroSnapMode() const OVERRIDE; | 295 virtual bool IsInMetroSnapMode() const override; |
| 296 #endif | 296 #endif |
| 297 virtual LocationBar* GetLocationBar() const OVERRIDE; | 297 virtual LocationBar* GetLocationBar() const override; |
| 298 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 298 virtual void SetFocusToLocationBar(bool select_all) override; |
| 299 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; | 299 virtual void UpdateReloadStopState(bool is_loading, bool force) override; |
| 300 virtual void UpdateToolbar(content::WebContents* contents) OVERRIDE; | 300 virtual void UpdateToolbar(content::WebContents* contents) override; |
| 301 virtual void FocusToolbar() OVERRIDE; | 301 virtual void FocusToolbar() override; |
| 302 virtual void FocusAppMenu() OVERRIDE; | 302 virtual void FocusAppMenu() override; |
| 303 virtual void FocusBookmarksToolbar() OVERRIDE; | 303 virtual void FocusBookmarksToolbar() override; |
| 304 virtual void FocusInfobars() OVERRIDE; | 304 virtual void FocusInfobars() override; |
| 305 virtual void RotatePaneFocus(bool forwards) OVERRIDE; | 305 virtual void RotatePaneFocus(bool forwards) override; |
| 306 virtual void DestroyBrowser() OVERRIDE; | 306 virtual void DestroyBrowser() override; |
| 307 virtual bool IsBookmarkBarVisible() const OVERRIDE; | 307 virtual bool IsBookmarkBarVisible() const override; |
| 308 virtual bool IsBookmarkBarAnimating() const OVERRIDE; | 308 virtual bool IsBookmarkBarAnimating() const override; |
| 309 virtual bool IsTabStripEditable() const OVERRIDE; | 309 virtual bool IsTabStripEditable() const override; |
| 310 virtual bool IsToolbarVisible() const OVERRIDE; | 310 virtual bool IsToolbarVisible() const override; |
| 311 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 311 virtual gfx::Rect GetRootWindowResizerRect() const override; |
| 312 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 312 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 313 Profile* profile) OVERRIDE; | 313 Profile* profile) override; |
| 314 virtual void ShowUpdateChromeDialog() OVERRIDE; | 314 virtual void ShowUpdateChromeDialog() override; |
| 315 virtual void ShowBookmarkBubble(const GURL& url, | 315 virtual void ShowBookmarkBubble(const GURL& url, |
| 316 bool already_bookmarked) OVERRIDE; | 316 bool already_bookmarked) override; |
| 317 virtual void ShowBookmarkAppBubble( | 317 virtual void ShowBookmarkAppBubble( |
| 318 const WebApplicationInfo& web_app_info, | 318 const WebApplicationInfo& web_app_info, |
| 319 const std::string& extension_id) OVERRIDE; | 319 const std::string& extension_id) override; |
| 320 virtual void ShowTranslateBubble( | 320 virtual void ShowTranslateBubble( |
| 321 content::WebContents* contents, | 321 content::WebContents* contents, |
| 322 translate::TranslateStep step, | 322 translate::TranslateStep step, |
| 323 translate::TranslateErrors::Type error_type, | 323 translate::TranslateErrors::Type error_type, |
| 324 bool is_user_gesture) OVERRIDE; | 324 bool is_user_gesture) override; |
| 325 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 325 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 326 virtual void ShowOneClickSigninBubble( | 326 virtual void ShowOneClickSigninBubble( |
| 327 OneClickSigninBubbleType type, | 327 OneClickSigninBubbleType type, |
| 328 const base::string16& email, | 328 const base::string16& email, |
| 329 const base::string16& error_message, | 329 const base::string16& error_message, |
| 330 const StartSyncCallback& start_sync_callback) OVERRIDE; | 330 const StartSyncCallback& start_sync_callback) override; |
| 331 #endif | 331 #endif |
| 332 // TODO(beng): Not an override, move somewhere else. | 332 // TODO(beng): Not an override, move somewhere else. |
| 333 void SetDownloadShelfVisible(bool visible); | 333 void SetDownloadShelfVisible(bool visible); |
| 334 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 334 virtual bool IsDownloadShelfVisible() const override; |
| 335 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 335 virtual DownloadShelf* GetDownloadShelf() override; |
| 336 virtual void ConfirmBrowserCloseWithPendingDownloads( | 336 virtual void ConfirmBrowserCloseWithPendingDownloads( |
| 337 int download_count, | 337 int download_count, |
| 338 Browser::DownloadClosePreventionType dialog_type, | 338 Browser::DownloadClosePreventionType dialog_type, |
| 339 bool app_modal, | 339 bool app_modal, |
| 340 const base::Callback<void(bool)>& callback) OVERRIDE; | 340 const base::Callback<void(bool)>& callback) override; |
| 341 virtual void UserChangedTheme() OVERRIDE; | 341 virtual void UserChangedTheme() override; |
| 342 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 342 virtual int GetExtraRenderViewHeight() const override; |
| 343 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 343 virtual void WebContentsFocused(content::WebContents* contents) override; |
| 344 virtual void ShowWebsiteSettings(Profile* profile, | 344 virtual void ShowWebsiteSettings(Profile* profile, |
| 345 content::WebContents* web_contents, | 345 content::WebContents* web_contents, |
| 346 const GURL& url, | 346 const GURL& url, |
| 347 const content::SSLStatus& ssl) OVERRIDE; | 347 const content::SSLStatus& ssl) override; |
| 348 virtual void ShowAppMenu() OVERRIDE; | 348 virtual void ShowAppMenu() override; |
| 349 virtual bool PreHandleKeyboardEvent( | 349 virtual bool PreHandleKeyboardEvent( |
| 350 const content::NativeWebKeyboardEvent& event, | 350 const content::NativeWebKeyboardEvent& event, |
| 351 bool* is_keyboard_shortcut) OVERRIDE; | 351 bool* is_keyboard_shortcut) override; |
| 352 virtual void HandleKeyboardEvent( | 352 virtual void HandleKeyboardEvent( |
| 353 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 353 const content::NativeWebKeyboardEvent& event) override; |
| 354 virtual void Cut() OVERRIDE; | 354 virtual void Cut() override; |
| 355 virtual void Copy() OVERRIDE; | 355 virtual void Copy() override; |
| 356 virtual void Paste() OVERRIDE; | 356 virtual void Paste() override; |
| 357 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 357 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 358 const gfx::Rect& bounds) OVERRIDE; | 358 const gfx::Rect& bounds) override; |
| 359 virtual FindBar* CreateFindBar() OVERRIDE; | 359 virtual FindBar* CreateFindBar() override; |
| 360 virtual web_modal::WebContentsModalDialogHost* | 360 virtual web_modal::WebContentsModalDialogHost* |
| 361 GetWebContentsModalDialogHost() OVERRIDE; | 361 GetWebContentsModalDialogHost() override; |
| 362 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 362 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 363 const gfx::Rect& rect) OVERRIDE; | 363 const gfx::Rect& rect) override; |
| 364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, | 364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, |
| 365 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE; | 365 const signin::ManageAccountsParams& manage_accounts_params) override; |
| 366 virtual void OverscrollUpdate(int delta_y) OVERRIDE; | 366 virtual void OverscrollUpdate(int delta_y) override; |
| 367 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; | 367 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; |
| 368 virtual void ExecuteExtensionCommand( | 368 virtual void ExecuteExtensionCommand( |
| 369 const extensions::Extension* extension, | 369 const extensions::Extension* extension, |
| 370 const extensions::Command& command) OVERRIDE; | 370 const extensions::Command& command) override; |
| 371 | 371 |
| 372 // Overridden from BrowserWindowTesting: | 372 // Overridden from BrowserWindowTesting: |
| 373 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 373 virtual BookmarkBarView* GetBookmarkBarView() const override; |
| 374 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 374 virtual LocationBarView* GetLocationBarView() const override; |
| 375 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 375 virtual views::View* GetTabContentsContainerView() const override; |
| 376 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 376 virtual ToolbarView* GetToolbarView() const override; |
| 377 | 377 |
| 378 // Overridden from TabStripModelObserver: | 378 // Overridden from TabStripModelObserver: |
| 379 virtual void TabInsertedAt(content::WebContents* contents, | 379 virtual void TabInsertedAt(content::WebContents* contents, |
| 380 int index, | 380 int index, |
| 381 bool foreground) OVERRIDE; | 381 bool foreground) override; |
| 382 virtual void TabDetachedAt(content::WebContents* contents, | 382 virtual void TabDetachedAt(content::WebContents* contents, |
| 383 int index) OVERRIDE; | 383 int index) override; |
| 384 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; | 384 virtual void TabDeactivated(content::WebContents* contents) override; |
| 385 virtual void TabStripEmpty() OVERRIDE; | 385 virtual void TabStripEmpty() override; |
| 386 virtual void WillCloseAllTabs() OVERRIDE; | 386 virtual void WillCloseAllTabs() override; |
| 387 virtual void CloseAllTabsCanceled() OVERRIDE; | 387 virtual void CloseAllTabsCanceled() override; |
| 388 | 388 |
| 389 // Overridden from ui::AcceleratorProvider: | 389 // Overridden from ui::AcceleratorProvider: |
| 390 virtual bool GetAcceleratorForCommandId(int command_id, | 390 virtual bool GetAcceleratorForCommandId(int command_id, |
| 391 ui::Accelerator* accelerator) OVERRIDE; | 391 ui::Accelerator* accelerator) override; |
| 392 | 392 |
| 393 // Overridden from views::WidgetDelegate: | 393 // Overridden from views::WidgetDelegate: |
| 394 virtual bool CanResize() const OVERRIDE; | 394 virtual bool CanResize() const override; |
| 395 virtual bool CanMaximize() const OVERRIDE; | 395 virtual bool CanMaximize() const override; |
| 396 virtual bool CanMinimize() const OVERRIDE; | 396 virtual bool CanMinimize() const override; |
| 397 virtual bool CanActivate() const OVERRIDE; | 397 virtual bool CanActivate() const override; |
| 398 virtual base::string16 GetWindowTitle() const OVERRIDE; | 398 virtual base::string16 GetWindowTitle() const override; |
| 399 virtual base::string16 GetAccessibleWindowTitle() const OVERRIDE; | 399 virtual base::string16 GetAccessibleWindowTitle() const override; |
| 400 virtual views::View* GetInitiallyFocusedView() OVERRIDE; | 400 virtual views::View* GetInitiallyFocusedView() override; |
| 401 virtual bool ShouldShowWindowTitle() const OVERRIDE; | 401 virtual bool ShouldShowWindowTitle() const override; |
| 402 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; | 402 virtual gfx::ImageSkia GetWindowAppIcon() override; |
| 403 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; | 403 virtual gfx::ImageSkia GetWindowIcon() override; |
| 404 virtual bool ShouldShowWindowIcon() const OVERRIDE; | 404 virtual bool ShouldShowWindowIcon() const override; |
| 405 virtual bool ExecuteWindowsCommand(int command_id) OVERRIDE; | 405 virtual bool ExecuteWindowsCommand(int command_id) override; |
| 406 virtual std::string GetWindowName() const OVERRIDE; | 406 virtual std::string GetWindowName() const override; |
| 407 virtual void SaveWindowPlacement(const gfx::Rect& bounds, | 407 virtual void SaveWindowPlacement(const gfx::Rect& bounds, |
| 408 ui::WindowShowState show_state) OVERRIDE; | 408 ui::WindowShowState show_state) override; |
| 409 virtual bool GetSavedWindowPlacement( | 409 virtual bool GetSavedWindowPlacement( |
| 410 const views::Widget* widget, | 410 const views::Widget* widget, |
| 411 gfx::Rect* bounds, | 411 gfx::Rect* bounds, |
| 412 ui::WindowShowState* show_state) const OVERRIDE; | 412 ui::WindowShowState* show_state) const override; |
| 413 virtual views::View* GetContentsView() OVERRIDE; | 413 virtual views::View* GetContentsView() override; |
| 414 virtual views::ClientView* CreateClientView(views::Widget* widget) OVERRIDE; | 414 virtual views::ClientView* CreateClientView(views::Widget* widget) override; |
| 415 virtual void OnWindowBeginUserBoundsChange() OVERRIDE; | 415 virtual void OnWindowBeginUserBoundsChange() override; |
| 416 virtual void OnWidgetMove() OVERRIDE; | 416 virtual void OnWidgetMove() override; |
| 417 virtual views::Widget* GetWidget() OVERRIDE; | 417 virtual views::Widget* GetWidget() override; |
| 418 virtual const views::Widget* GetWidget() const OVERRIDE; | 418 virtual const views::Widget* GetWidget() const override; |
| 419 virtual void GetAccessiblePanes(std::vector<View*>* panes) OVERRIDE; | 419 virtual void GetAccessiblePanes(std::vector<View*>* panes) override; |
| 420 | 420 |
| 421 // Overridden from views::WidgetObserver: | 421 // Overridden from views::WidgetObserver: |
| 422 virtual void OnWidgetActivationChanged(views::Widget* widget, | 422 virtual void OnWidgetActivationChanged(views::Widget* widget, |
| 423 bool active) OVERRIDE; | 423 bool active) override; |
| 424 | 424 |
| 425 // Overridden from views::ClientView: | 425 // Overridden from views::ClientView: |
| 426 virtual bool CanClose() OVERRIDE; | 426 virtual bool CanClose() override; |
| 427 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; | 427 virtual int NonClientHitTest(const gfx::Point& point) override; |
| 428 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 428 virtual gfx::Size GetMinimumSize() const override; |
| 429 | 429 |
| 430 // InfoBarContainer::Delegate overrides | 430 // InfoBarContainer::Delegate overrides |
| 431 virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE; | 431 virtual SkColor GetInfoBarSeparatorColor() const override; |
| 432 virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE; | 432 virtual void InfoBarContainerStateChanged(bool is_animating) override; |
| 433 virtual bool DrawInfoBarArrows(int* x) const OVERRIDE; | 433 virtual bool DrawInfoBarArrows(int* x) const override; |
| 434 | 434 |
| 435 // Overridden from views::View: | 435 // Overridden from views::View: |
| 436 virtual const char* GetClassName() const OVERRIDE; | 436 virtual const char* GetClassName() const override; |
| 437 virtual void Layout() OVERRIDE; | 437 virtual void Layout() override; |
| 438 virtual void PaintChildren(gfx::Canvas* canvas, | 438 virtual void PaintChildren(gfx::Canvas* canvas, |
| 439 const views::CullSet& cull_set) OVERRIDE; | 439 const views::CullSet& cull_set) override; |
| 440 virtual void ViewHierarchyChanged( | 440 virtual void ViewHierarchyChanged( |
| 441 const ViewHierarchyChangedDetails& details) OVERRIDE; | 441 const ViewHierarchyChangedDetails& details) override; |
| 442 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 442 virtual void ChildPreferredSizeChanged(View* child) override; |
| 443 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; | 443 virtual void GetAccessibleState(ui::AXViewState* state) override; |
| 444 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; | 444 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; |
| 445 | 445 |
| 446 // Overridden from ui::AcceleratorTarget: | 446 // Overridden from ui::AcceleratorTarget: |
| 447 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; | 447 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
| 448 | 448 |
| 449 // OmniboxPopupModelObserver overrides | 449 // OmniboxPopupModelObserver overrides |
| 450 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; | 450 virtual void OnOmniboxPopupShownOrHidden() override; |
| 451 | 451 |
| 452 // Testing interface: | 452 // Testing interface: |
| 453 views::View* GetContentsContainerForTest() { return contents_container_; } | 453 views::View* GetContentsContainerForTest() { return contents_container_; } |
| 454 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } | 454 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
| 455 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } | 455 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } |
| 456 | 456 |
| 457 private: | 457 private: |
| 458 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate | 458 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate |
| 459 // interface to keep these two classes decoupled and testable. | 459 // interface to keep these two classes decoupled and testable. |
| 460 friend class BrowserViewLayoutDelegateImpl; | 460 friend class BrowserViewLayoutDelegateImpl; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 472 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); | 472 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); |
| 473 | 473 |
| 474 // Constructs and initializes the child views. | 474 // Constructs and initializes the child views. |
| 475 void InitViews(); | 475 void InitViews(); |
| 476 | 476 |
| 477 // Callback for the loading animation(s) associated with this view. | 477 // Callback for the loading animation(s) associated with this view. |
| 478 void LoadingAnimationCallback(); | 478 void LoadingAnimationCallback(); |
| 479 | 479 |
| 480 // LoadCompleteListener::Delegate implementation. Creates and initializes the | 480 // LoadCompleteListener::Delegate implementation. Creates and initializes the |
| 481 // |jumplist_| after the first page load. | 481 // |jumplist_| after the first page load. |
| 482 virtual void OnLoadCompleted() OVERRIDE; | 482 virtual void OnLoadCompleted() override; |
| 483 | 483 |
| 484 // Returns the BrowserViewLayout. | 484 // Returns the BrowserViewLayout. |
| 485 BrowserViewLayout* GetBrowserViewLayout() const; | 485 BrowserViewLayout* GetBrowserViewLayout() const; |
| 486 | 486 |
| 487 // Returns the ContentsLayoutManager. | 487 // Returns the ContentsLayoutManager. |
| 488 ContentsLayoutManager* GetContentsLayoutManager() const; | 488 ContentsLayoutManager* GetContentsLayoutManager() const; |
| 489 | 489 |
| 490 // Prepare to show the Bookmark Bar for the specified WebContents. | 490 // Prepare to show the Bookmark Bar for the specified WebContents. |
| 491 // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this | 491 // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this |
| 492 // Browser type) and there should be a subsequent re-layout to show it. | 492 // Browser type) and there should be a subsequent re-layout to show it. |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 711 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
| 712 | 712 |
| 713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
| 714 | 714 |
| 715 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 715 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 716 | 716 |
| 717 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 717 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 718 }; | 718 }; |
| 719 | 719 |
| 720 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 720 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |