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