| 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 325 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; |
| 326 virtual void DisableInactiveFrame() OVERRIDE; | 326 virtual void DisableInactiveFrame() OVERRIDE; |
| 327 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 327 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 328 Profile* profile) OVERRIDE; | 328 Profile* profile) OVERRIDE; |
| 329 virtual void ShowUpdateChromeDialog() OVERRIDE; | 329 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 330 virtual void ShowBookmarkBubble(const GURL& url, | 330 virtual void ShowBookmarkBubble(const GURL& url, |
| 331 bool already_bookmarked) OVERRIDE; | 331 bool already_bookmarked) OVERRIDE; |
| 332 virtual void ShowBookmarkPrompt() OVERRIDE; | 332 virtual void ShowBookmarkPrompt() OVERRIDE; |
| 333 virtual void ShowTranslateBubble( | 333 virtual void ShowTranslateBubble( |
| 334 content::WebContents* contents, | 334 content::WebContents* contents, |
| 335 TranslateBubbleModel::ViewState view_state) OVERRIDE; | 335 TranslateBubbleModel::ViewState view_state, |
| 336 TranslateErrors::Type error_type) OVERRIDE; |
| 336 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 337 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 337 virtual void ShowOneClickSigninBubble( | 338 virtual void ShowOneClickSigninBubble( |
| 338 OneClickSigninBubbleType type, | 339 OneClickSigninBubbleType type, |
| 339 const string16& email, | 340 const string16& email, |
| 340 const string16& error_message, | 341 const string16& error_message, |
| 341 const StartSyncCallback& start_sync_callback) OVERRIDE; | 342 const StartSyncCallback& start_sync_callback) OVERRIDE; |
| 342 #endif | 343 #endif |
| 343 // TODO(beng): Not an override, move somewhere else. | 344 // TODO(beng): Not an override, move somewhere else. |
| 344 void SetDownloadShelfVisible(bool visible); | 345 void SetDownloadShelfVisible(bool visible); |
| 345 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 346 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 744 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 745 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
| 745 | 746 |
| 746 gfx::ScopedSysColorChangeListener color_change_listener_; | 747 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 747 | 748 |
| 748 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 749 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 749 | 750 |
| 750 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 751 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 751 }; | 752 }; |
| 752 | 753 |
| 753 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 754 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |