| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 virtual void ToggleBookmarkBar() OVERRIDE; | 269 virtual void ToggleBookmarkBar() OVERRIDE; |
| 270 virtual void ShowAboutChromeDialog() OVERRIDE; | 270 virtual void ShowAboutChromeDialog() OVERRIDE; |
| 271 virtual void ShowUpdateChromeDialog() OVERRIDE; | 271 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 272 virtual void ShowTaskManager() OVERRIDE; | 272 virtual void ShowTaskManager() OVERRIDE; |
| 273 virtual void ShowBackgroundPages() OVERRIDE; | 273 virtual void ShowBackgroundPages() OVERRIDE; |
| 274 virtual void ShowBookmarkBubble(const GURL& url, | 274 virtual void ShowBookmarkBubble(const GURL& url, |
| 275 bool already_bookmarked) OVERRIDE; | 275 bool already_bookmarked) OVERRIDE; |
| 276 virtual void ShowChromeToMobileBubble() OVERRIDE; | 276 virtual void ShowChromeToMobileBubble() OVERRIDE; |
| 277 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 277 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 278 virtual void ShowOneClickSigninBubble( | 278 virtual void ShowOneClickSigninBubble( |
| 279 const base::Closure& learn_more_callback, | 279 const StartSyncCallback& start_sync_callback) OVERRIDE; |
| 280 const base::Closure& advanced_callback) OVERRIDE; | |
| 281 #endif | 280 #endif |
| 282 // TODO(beng): Not an override, move somewhere else. | 281 // TODO(beng): Not an override, move somewhere else. |
| 283 void SetDownloadShelfVisible(bool visible); | 282 void SetDownloadShelfVisible(bool visible); |
| 284 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 283 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
| 285 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 284 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; |
| 286 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; | 285 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; |
| 287 virtual void UserChangedTheme() OVERRIDE; | 286 virtual void UserChangedTheme() OVERRIDE; |
| 288 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 287 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
| 289 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 288 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
| 290 virtual void ShowPageInfo(Profile* profile, | 289 virtual void ShowPageInfo(Profile* profile, |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 674 bool force_location_bar_focus_; | 673 bool force_location_bar_focus_; |
| 675 | 674 |
| 676 PendingFullscreenRequest fullscreen_request_; | 675 PendingFullscreenRequest fullscreen_request_; |
| 677 | 676 |
| 678 gfx::ScopedSysColorChangeListener color_change_listener_; | 677 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 679 | 678 |
| 680 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 679 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 681 }; | 680 }; |
| 682 | 681 |
| 683 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 682 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |