| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 struct SearchMode; | 64 struct SearchMode; |
| 65 struct WebApplicationInfo; | 65 struct WebApplicationInfo; |
| 66 | 66 |
| 67 namespace chrome { | 67 namespace chrome { |
| 68 class BrowserCommandController; | 68 class BrowserCommandController; |
| 69 class UnloadController; | 69 class UnloadController; |
| 70 } | 70 } |
| 71 | 71 |
| 72 namespace content { | 72 namespace content { |
| 73 class NavigationController; | 73 class NavigationController; |
| 74 class PageState; |
| 74 class SessionStorageNamespace; | 75 class SessionStorageNamespace; |
| 75 } | 76 } |
| 76 | 77 |
| 77 namespace extensions { | 78 namespace extensions { |
| 78 class Extension; | 79 class Extension; |
| 79 class WindowController; | 80 class WindowController; |
| 80 } | 81 } |
| 81 | 82 |
| 82 namespace gfx { | 83 namespace gfx { |
| 83 class Image; | 84 class Image; |
| (...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 virtual bool ShouldFocusLocationBarByDefault( | 548 virtual bool ShouldFocusLocationBarByDefault( |
| 548 content::WebContents* source) OVERRIDE; | 549 content::WebContents* source) OVERRIDE; |
| 549 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 550 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; |
| 550 virtual void RenderWidgetShowing() OVERRIDE; | 551 virtual void RenderWidgetShowing() OVERRIDE; |
| 551 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 552 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
| 552 virtual void ViewSourceForTab(content::WebContents* source, | 553 virtual void ViewSourceForTab(content::WebContents* source, |
| 553 const GURL& page_url) OVERRIDE; | 554 const GURL& page_url) OVERRIDE; |
| 554 virtual void ViewSourceForFrame( | 555 virtual void ViewSourceForFrame( |
| 555 content::WebContents* source, | 556 content::WebContents* source, |
| 556 const GURL& frame_url, | 557 const GURL& frame_url, |
| 557 const std::string& frame_content_state) OVERRIDE; | 558 const content::PageState& frame_page_state) OVERRIDE; |
| 558 virtual void ShowRepostFormWarningDialog( | 559 virtual void ShowRepostFormWarningDialog( |
| 559 content::WebContents* source) OVERRIDE; | 560 content::WebContents* source) OVERRIDE; |
| 560 virtual bool ShouldCreateWebContents( | 561 virtual bool ShouldCreateWebContents( |
| 561 content::WebContents* web_contents, | 562 content::WebContents* web_contents, |
| 562 int route_id, | 563 int route_id, |
| 563 WindowContainerType window_container_type, | 564 WindowContainerType window_container_type, |
| 564 const string16& frame_name, | 565 const string16& frame_name, |
| 565 const GURL& target_url) OVERRIDE; | 566 const GURL& target_url) OVERRIDE; |
| 566 virtual void WebContentsCreated(content::WebContents* source_contents, | 567 virtual void WebContentsCreated(content::WebContents* source_contents, |
| 567 int64 source_frame_id, | 568 int64 source_frame_id, |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 915 bool window_has_shown_; | 916 bool window_has_shown_; |
| 916 | 917 |
| 917 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 918 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 918 // before DidEndColorChooser is called. | 919 // before DidEndColorChooser is called. |
| 919 scoped_ptr<content::ColorChooser> color_chooser_; | 920 scoped_ptr<content::ColorChooser> color_chooser_; |
| 920 | 921 |
| 921 DISALLOW_COPY_AND_ASSIGN(Browser); | 922 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 922 }; | 923 }; |
| 923 | 924 |
| 924 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 925 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |