OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
247 virtual void UpdateTitleBar() OVERRIDE; | 247 virtual void UpdateTitleBar() OVERRIDE; |
248 virtual void BookmarkBarStateChanged( | 248 virtual void BookmarkBarStateChanged( |
249 BookmarkBar::AnimateChangeType change_type) OVERRIDE; | 249 BookmarkBar::AnimateChangeType change_type) OVERRIDE; |
250 virtual void UpdateDevTools() OVERRIDE; | 250 virtual void UpdateDevTools() OVERRIDE; |
251 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; | 251 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; |
252 virtual void SetStarredState(bool is_starred) OVERRIDE; | 252 virtual void SetStarredState(bool is_starred) OVERRIDE; |
253 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; | 253 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; |
254 virtual gfx::Rect GetBounds() const OVERRIDE; | 254 virtual gfx::Rect GetBounds() const OVERRIDE; |
255 virtual bool IsMaximized() const OVERRIDE; | 255 virtual bool IsMaximized() const OVERRIDE; |
256 virtual bool IsMinimized() const OVERRIDE; | 256 virtual bool IsMinimized() const OVERRIDE; |
257 virtual void SetFullscreen(bool fullscreen) OVERRIDE; | 257 virtual void SetFullscreen(bool fullscreen, const GURL& url, |
Peter Kasting
2011/10/11 23:08:32
Nit: One arg per line, aligned
koz (OOO until 15th September)
2011/10/12 05:38:23
Done.
| |
258 bool ask_permission) OVERRIDE; | |
258 virtual bool IsFullscreen() const OVERRIDE; | 259 virtual bool IsFullscreen() const OVERRIDE; |
259 virtual LocationBar* GetLocationBar() const OVERRIDE; | 260 virtual LocationBar* GetLocationBar() const OVERRIDE; |
260 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 261 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; |
261 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; | 262 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; |
262 virtual void UpdateToolbar(TabContentsWrapper* contents, | 263 virtual void UpdateToolbar(TabContentsWrapper* contents, |
263 bool should_restore_state) OVERRIDE; | 264 bool should_restore_state) OVERRIDE; |
264 virtual void FocusToolbar() OVERRIDE; | 265 virtual void FocusToolbar() OVERRIDE; |
265 virtual void FocusAppMenu() OVERRIDE; | 266 virtual void FocusAppMenu() OVERRIDE; |
266 virtual void FocusBookmarksToolbar() OVERRIDE; | 267 virtual void FocusBookmarksToolbar() OVERRIDE; |
267 virtual void FocusChromeOSStatus() OVERRIDE {} | 268 virtual void FocusChromeOSStatus() OVERRIDE {} |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
493 // the new_view is added. This is intended to be used when swapping in/out | 494 // the new_view is added. This is intended to be used when swapping in/out |
494 // child views that are referenced via a field. | 495 // child views that are referenced via a field. |
495 // Returns true if anything was changed, and a re-Layout is now required. | 496 // Returns true if anything was changed, and a re-Layout is now required. |
496 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); | 497 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); |
497 | 498 |
498 // Invoked to update the necessary things when our fullscreen state changes | 499 // Invoked to update the necessary things when our fullscreen state changes |
499 // to |fullscreen|. On Windows this is invoked immediately when we toggle the | 500 // to |fullscreen|. On Windows this is invoked immediately when we toggle the |
500 // full screen state. On Linux changing the fullscreen state is async, so we | 501 // full screen state. On Linux changing the fullscreen state is async, so we |
501 // ask the window to change it's fullscreen state, then when we get | 502 // ask the window to change it's fullscreen state, then when we get |
502 // notification that it succeeded this method is invoked. | 503 // notification that it succeeded this method is invoked. |
503 void ProcessFullscreen(bool fullscreen); | 504 // If |url| is not empty, it is the URL of the page that requested fullscreen |
505 // (via the fullscreen JS API). | |
506 // |ask_permission| determines whether the user should be asked to allow the | |
507 // site to remain fullscreen. | |
508 void ProcessFullscreen(bool fullscreen, const GURL& url, bool ask_permission); | |
504 | 509 |
505 // Copy the accelerator table from the app resources into something we can | 510 // Copy the accelerator table from the app resources into something we can |
506 // use. | 511 // use. |
507 void LoadAccelerators(); | 512 void LoadAccelerators(); |
508 | 513 |
509 #if defined(OS_WIN) | 514 #if defined(OS_WIN) |
510 // Builds the correct menu for when we have minimal chrome. | 515 // Builds the correct menu for when we have minimal chrome. |
511 void BuildSystemMenuForBrowserWindow(); | 516 void BuildSystemMenuForBrowserWindow(); |
512 void BuildSystemMenuForAppOrPopupWindow(); | 517 void BuildSystemMenuForAppOrPopupWindow(); |
513 | 518 |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
693 base::TimeTicks last_animation_time_; | 698 base::TimeTicks last_animation_time_; |
694 | 699 |
695 // If this flag is set then SetFocusToLocationBar() will set focus to the | 700 // If this flag is set then SetFocusToLocationBar() will set focus to the |
696 // location bar even if the browser window is not active. | 701 // location bar even if the browser window is not active. |
697 bool force_location_bar_focus_; | 702 bool force_location_bar_focus_; |
698 | 703 |
699 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 704 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
700 }; | 705 }; |
701 | 706 |
702 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 707 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |