| 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 const gfx::Size& new_size) OVERRIDE; | 980 const gfx::Size& new_size) OVERRIDE; |
| 981 | 981 |
| 982 virtual void FindReply(content::WebContents* tab, | 982 virtual void FindReply(content::WebContents* tab, |
| 983 int request_id, | 983 int request_id, |
| 984 int number_of_matches, | 984 int number_of_matches, |
| 985 const gfx::Rect& selection_rect, | 985 const gfx::Rect& selection_rect, |
| 986 int active_match_ordinal, | 986 int active_match_ordinal, |
| 987 bool final_update) OVERRIDE; | 987 bool final_update) OVERRIDE; |
| 988 | 988 |
| 989 virtual void RequestToLockMouse(content::WebContents* tab, | 989 virtual void RequestToLockMouse(content::WebContents* tab, |
| 990 bool user_gesture) OVERRIDE; | 990 bool user_gesture, |
| 991 bool after_unlocked_by_target) OVERRIDE; |
| 991 virtual void LostMouseLock() OVERRIDE; | 992 virtual void LostMouseLock() OVERRIDE; |
| 992 | 993 |
| 993 // Overridden from CoreTabHelperDelegate: | 994 // Overridden from CoreTabHelperDelegate: |
| 994 // Note that the caller is responsible for deleting |old_tab_contents|. | 995 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 995 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 996 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| 996 TabContentsWrapper* new_tab_contents) OVERRIDE; | 997 TabContentsWrapper* new_tab_contents) OVERRIDE; |
| 997 | 998 |
| 998 // Overridden from SearchEngineTabHelperDelegate: | 999 // Overridden from SearchEngineTabHelperDelegate: |
| 999 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 1000 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 1000 Profile* profile) OVERRIDE; | 1001 Profile* profile) OVERRIDE; |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1406 bool window_has_shown_; | 1407 bool window_has_shown_; |
| 1407 | 1408 |
| 1408 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1409 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1409 // before DidEndColorChooser is called. | 1410 // before DidEndColorChooser is called. |
| 1410 scoped_ptr<content::ColorChooser> color_chooser_; | 1411 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1411 | 1412 |
| 1412 DISALLOW_COPY_AND_ASSIGN(Browser); | 1413 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1413 }; | 1414 }; |
| 1414 | 1415 |
| 1415 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1416 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |