Chromium Code Reviews| 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 25 matching lines...) Expand all Loading... | |
| 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 37 #include "chrome/browser/ui/select_file_dialog.h" | 37 #include "chrome/browser/ui/select_file_dialog.h" |
| 38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
| 40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 41 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 41 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 43 #include "chrome/common/content_settings.h" | 43 #include "chrome/common/content_settings.h" |
| 44 #include "chrome/common/content_settings_types.h" | 44 #include "chrome/common/content_settings_types.h" |
| 45 #include "chrome/common/extensions/extension_constants.h" | 45 #include "chrome/common/extensions/extension_constants.h" |
| 46 #include "content/common/mouse_lock.h" | |
| 46 #include "content/public/browser/notification_registrar.h" | 47 #include "content/public/browser/notification_registrar.h" |
| 47 #include "content/public/browser/page_navigator.h" | 48 #include "content/public/browser/page_navigator.h" |
| 48 #include "content/public/browser/web_contents_delegate.h" | 49 #include "content/public/browser/web_contents_delegate.h" |
| 49 #include "content/public/common/page_transition_types.h" | 50 #include "content/public/common/page_transition_types.h" |
| 50 #include "content/public/common/page_zoom.h" | 51 #include "content/public/common/page_zoom.h" |
| 51 #include "ui/base/ui_base_types.h" | 52 #include "ui/base/ui_base_types.h" |
| 52 #include "ui/gfx/rect.h" | 53 #include "ui/gfx/rect.h" |
| 53 | 54 |
| 54 class BrowserContentSettingBubbleModelDelegate; | 55 class BrowserContentSettingBubbleModelDelegate; |
| 55 class BrowserSyncedWindowDelegate; | 56 class BrowserSyncedWindowDelegate; |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 979 virtual void ResizeDueToAutoResize(content::WebContents* source, | 980 virtual void ResizeDueToAutoResize(content::WebContents* source, |
| 980 const gfx::Size& new_size) OVERRIDE; | 981 const gfx::Size& new_size) OVERRIDE; |
| 981 | 982 |
| 982 virtual void FindReply(content::WebContents* tab, | 983 virtual void FindReply(content::WebContents* tab, |
| 983 int request_id, | 984 int request_id, |
| 984 int number_of_matches, | 985 int number_of_matches, |
| 985 const gfx::Rect& selection_rect, | 986 const gfx::Rect& selection_rect, |
| 986 int active_match_ordinal, | 987 int active_match_ordinal, |
| 987 bool final_update) OVERRIDE; | 988 bool final_update) OVERRIDE; |
| 988 | 989 |
| 989 virtual void RequestToLockMouse(content::WebContents* tab, | 990 virtual void RequestToLockMouse( |
| 990 bool user_gesture) OVERRIDE; | 991 content::WebContents* tab, |
| 992 content::MouseLockSource lock_source, | |
|
scheib
2012/05/30 16:41:21
Comment: This naming has become unfortunately abst
| |
| 993 content::MouseUnlockSource previous_unlock_source) OVERRIDE; | |
| 991 virtual void LostMouseLock() OVERRIDE; | 994 virtual void LostMouseLock() OVERRIDE; |
| 992 | 995 |
| 993 // Overridden from CoreTabHelperDelegate: | 996 // Overridden from CoreTabHelperDelegate: |
| 994 // Note that the caller is responsible for deleting |old_tab_contents|. | 997 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 995 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 998 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| 996 TabContentsWrapper* new_tab_contents) OVERRIDE; | 999 TabContentsWrapper* new_tab_contents) OVERRIDE; |
| 997 | 1000 |
| 998 // Overridden from SearchEngineTabHelperDelegate: | 1001 // Overridden from SearchEngineTabHelperDelegate: |
| 999 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 1002 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 1000 Profile* profile) OVERRIDE; | 1003 Profile* profile) OVERRIDE; |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1406 bool window_has_shown_; | 1409 bool window_has_shown_; |
| 1407 | 1410 |
| 1408 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1411 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1409 // before DidEndColorChooser is called. | 1412 // before DidEndColorChooser is called. |
| 1410 scoped_ptr<content::ColorChooser> color_chooser_; | 1413 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1411 | 1414 |
| 1412 DISALLOW_COPY_AND_ASSIGN(Browser); | 1415 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1413 }; | 1416 }; |
| 1414 | 1417 |
| 1415 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1418 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |