| 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 virtual void ToggleBookmarkBar() OVERRIDE; | 317 virtual void ToggleBookmarkBar() OVERRIDE; |
| 318 virtual void ShowUpdateChromeDialog() OVERRIDE; | 318 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 319 virtual void ShowBookmarkBubble(const GURL& url, | 319 virtual void ShowBookmarkBubble(const GURL& url, |
| 320 bool already_bookmarked) OVERRIDE; | 320 bool already_bookmarked) OVERRIDE; |
| 321 virtual void ShowBookmarkPrompt() OVERRIDE; | 321 virtual void ShowBookmarkPrompt() OVERRIDE; |
| 322 virtual void ShowChromeToMobileBubble() OVERRIDE; | 322 virtual void ShowChromeToMobileBubble() OVERRIDE; |
| 323 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 323 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 324 virtual void ShowOneClickSigninBubble( | 324 virtual void ShowOneClickSigninBubble( |
| 325 OneClickSigninBubbleType type, | 325 OneClickSigninBubbleType type, |
| 326 const string16& email, | 326 const string16& email, |
| 327 const string16& error_message, |
| 327 const StartSyncCallback& start_sync_callback) OVERRIDE; | 328 const StartSyncCallback& start_sync_callback) OVERRIDE; |
| 328 #endif | 329 #endif |
| 329 // TODO(beng): Not an override, move somewhere else. | 330 // TODO(beng): Not an override, move somewhere else. |
| 330 void SetDownloadShelfVisible(bool visible); | 331 void SetDownloadShelfVisible(bool visible); |
| 331 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 332 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
| 332 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 333 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; |
| 333 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; | 334 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; |
| 334 virtual void UserChangedTheme() OVERRIDE; | 335 virtual void UserChangedTheme() OVERRIDE; |
| 335 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 336 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
| 336 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 337 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 gfx::ScopedSysColorChangeListener color_change_listener_; | 746 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 746 | 747 |
| 747 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 748 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 748 | 749 |
| 749 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 750 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 750 | 751 |
| 751 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 752 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 752 }; | 753 }; |
| 753 | 754 |
| 754 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 755 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |