| 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 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1054 virtual void ResizeDueToAutoResize(content::WebContents* source, | 1054 virtual void ResizeDueToAutoResize(content::WebContents* source, |
| 1055 const gfx::Size& new_size) OVERRIDE; | 1055 const gfx::Size& new_size) OVERRIDE; |
| 1056 | 1056 |
| 1057 virtual void FindReply(content::WebContents* tab, | 1057 virtual void FindReply(content::WebContents* tab, |
| 1058 int request_id, | 1058 int request_id, |
| 1059 int number_of_matches, | 1059 int number_of_matches, |
| 1060 const gfx::Rect& selection_rect, | 1060 const gfx::Rect& selection_rect, |
| 1061 int active_match_ordinal, | 1061 int active_match_ordinal, |
| 1062 bool final_update) OVERRIDE; | 1062 bool final_update) OVERRIDE; |
| 1063 | 1063 |
| 1064 virtual void RequestToLockMouse(content::WebContents* tab) OVERRIDE; | 1064 virtual void RequestToLockMouse(content::WebContents* tab, |
| 1065 bool user_gesture) OVERRIDE; |
| 1065 virtual void LostMouseLock() OVERRIDE; | 1066 virtual void LostMouseLock() OVERRIDE; |
| 1066 | 1067 |
| 1067 // Overridden from CoreTabHelperDelegate: | 1068 // Overridden from CoreTabHelperDelegate: |
| 1068 // Note that the caller is responsible for deleting |old_tab_contents|. | 1069 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 1069 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 1070 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| 1070 TabContentsWrapper* new_tab_contents) OVERRIDE; | 1071 TabContentsWrapper* new_tab_contents) OVERRIDE; |
| 1071 | 1072 |
| 1072 // Overridden from SearchEngineTabHelperDelegate: | 1073 // Overridden from SearchEngineTabHelperDelegate: |
| 1073 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, | 1074 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, |
| 1074 Profile* profile) OVERRIDE; | 1075 Profile* profile) OVERRIDE; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1485 bool window_has_shown_; | 1486 bool window_has_shown_; |
| 1486 | 1487 |
| 1487 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1488 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1488 // before DidEndColorChooser is called. | 1489 // before DidEndColorChooser is called. |
| 1489 scoped_ptr<content::ColorChooser> color_chooser_; | 1490 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1490 | 1491 |
| 1491 DISALLOW_COPY_AND_ASSIGN(Browser); | 1492 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1492 }; | 1493 }; |
| 1493 | 1494 |
| 1494 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1495 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |