| 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 virtual void FocusAppMenu() OVERRIDE; | 265 virtual void FocusAppMenu() OVERRIDE; |
| 266 virtual void FocusBookmarksToolbar() OVERRIDE; | 266 virtual void FocusBookmarksToolbar() OVERRIDE; |
| 267 virtual void FocusChromeOSStatus() OVERRIDE {} | 267 virtual void FocusChromeOSStatus() OVERRIDE {} |
| 268 virtual void RotatePaneFocus(bool forwards) OVERRIDE; | 268 virtual void RotatePaneFocus(bool forwards) OVERRIDE; |
| 269 virtual void DestroyBrowser() OVERRIDE; | 269 virtual void DestroyBrowser() OVERRIDE; |
| 270 virtual bool IsBookmarkBarVisible() const OVERRIDE; | 270 virtual bool IsBookmarkBarVisible() const OVERRIDE; |
| 271 virtual bool IsBookmarkBarAnimating() const OVERRIDE; | 271 virtual bool IsBookmarkBarAnimating() const OVERRIDE; |
| 272 virtual bool IsTabStripEditable() const OVERRIDE; | 272 virtual bool IsTabStripEditable() const OVERRIDE; |
| 273 virtual bool IsToolbarVisible() const OVERRIDE; | 273 virtual bool IsToolbarVisible() const OVERRIDE; |
| 274 virtual void DisableInactiveFrame() OVERRIDE; | 274 virtual void DisableInactiveFrame() OVERRIDE; |
| 275 virtual void ConfirmSetDefaultSearchProvider( | 275 virtual void ConfirmSetDefaultSearchProvider(TabContents* tab_contents, |
| 276 TabContents* tab_contents, | 276 TemplateURL* template_url, |
| 277 TemplateURL* template_url, | 277 Profile* profile) OVERRIDE; |
| 278 TemplateURLService* template_url_service) OVERRIDE; | |
| 279 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, | 278 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, |
| 280 Profile* profile) OVERRIDE; | 279 Profile* profile) OVERRIDE; |
| 281 virtual void ToggleBookmarkBar() OVERRIDE; | 280 virtual void ToggleBookmarkBar() OVERRIDE; |
| 282 virtual void ShowAboutChromeDialog() OVERRIDE; | 281 virtual void ShowAboutChromeDialog() OVERRIDE; |
| 283 virtual void ShowUpdateChromeDialog() OVERRIDE; | 282 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 284 virtual void ShowTaskManager() OVERRIDE; | 283 virtual void ShowTaskManager() OVERRIDE; |
| 285 virtual void ShowBackgroundPages() OVERRIDE; | 284 virtual void ShowBackgroundPages() OVERRIDE; |
| 286 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) | 285 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) |
| 287 OVERRIDE; | 286 OVERRIDE; |
| 288 // TODO(beng): Not an override, move somewhere else. | 287 // TODO(beng): Not an override, move somewhere else. |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 base::TimeTicks last_animation_time_; | 692 base::TimeTicks last_animation_time_; |
| 694 | 693 |
| 695 // If this flag is set then SetFocusToLocationBar() will set focus to the | 694 // If this flag is set then SetFocusToLocationBar() will set focus to the |
| 696 // location bar even if the browser window is not active. | 695 // location bar even if the browser window is not active. |
| 697 bool force_location_bar_focus_; | 696 bool force_location_bar_focus_; |
| 698 | 697 |
| 699 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 698 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 700 }; | 699 }; |
| 701 | 700 |
| 702 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 701 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |