| 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 19 matching lines...) Expand all Loading... |
| 30 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 30 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 31 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 31 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 32 #include "chrome/browser/ui/zoom/zoom_observer.h" | 32 #include "chrome/browser/ui/zoom/zoom_observer.h" |
| 33 #include "components/content_settings/core/common/content_settings.h" | 33 #include "components/content_settings/core/common/content_settings.h" |
| 34 #include "components/content_settings/core/common/content_settings_types.h" | 34 #include "components/content_settings/core/common/content_settings_types.h" |
| 35 #include "components/sessions/session_id.h" | 35 #include "components/sessions/session_id.h" |
| 36 #include "content/public/browser/notification_observer.h" | 36 #include "content/public/browser/notification_observer.h" |
| 37 #include "content/public/browser/notification_registrar.h" | 37 #include "content/public/browser/notification_registrar.h" |
| 38 #include "content/public/browser/page_navigator.h" | 38 #include "content/public/browser/page_navigator.h" |
| 39 #include "content/public/browser/web_contents_delegate.h" | 39 #include "content/public/browser/web_contents_delegate.h" |
| 40 #include "content/public/common/page_transition_types.h" | |
| 41 #include "content/public/common/page_zoom.h" | 40 #include "content/public/common/page_zoom.h" |
| 41 #include "ui/base/page_transition_types.h" |
| 42 #include "ui/base/ui_base_types.h" | 42 #include "ui/base/ui_base_types.h" |
| 43 #include "ui/base/window_open_disposition.h" | 43 #include "ui/base/window_open_disposition.h" |
| 44 #include "ui/gfx/rect.h" | 44 #include "ui/gfx/rect.h" |
| 45 #include "ui/shell_dialogs/select_file_dialog.h" | 45 #include "ui/shell_dialogs/select_file_dialog.h" |
| 46 | 46 |
| 47 class BrowserContentSettingBubbleModelDelegate; | 47 class BrowserContentSettingBubbleModelDelegate; |
| 48 class BrowserContentTranslateDriverObserver; | 48 class BrowserContentTranslateDriverObserver; |
| 49 class BrowserInstantController; | 49 class BrowserInstantController; |
| 50 class BrowserSyncedWindowDelegate; | 50 class BrowserSyncedWindowDelegate; |
| 51 class BrowserToolbarModelDelegate; | 51 class BrowserToolbarModelDelegate; |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 // Show various bits of UI | 386 // Show various bits of UI |
| 387 void OpenFile(); | 387 void OpenFile(); |
| 388 | 388 |
| 389 void UpdateDownloadShelfVisibility(bool visible); | 389 void UpdateDownloadShelfVisibility(bool visible); |
| 390 | 390 |
| 391 ///////////////////////////////////////////////////////////////////////////// | 391 ///////////////////////////////////////////////////////////////////////////// |
| 392 | 392 |
| 393 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 393 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
| 394 // this Browser. Updates the UI for the start of this navigation. | 394 // this Browser. Updates the UI for the start of this navigation. |
| 395 void UpdateUIForNavigationInTab(content::WebContents* contents, | 395 void UpdateUIForNavigationInTab(content::WebContents* contents, |
| 396 content::PageTransition transition, | 396 ui::PageTransition transition, |
| 397 bool user_initiated); | 397 bool user_initiated); |
| 398 | 398 |
| 399 // Interface implementations //////////////////////////////////////////////// | 399 // Interface implementations //////////////////////////////////////////////// |
| 400 | 400 |
| 401 // Overridden from content::PageNavigator: | 401 // Overridden from content::PageNavigator: |
| 402 virtual content::WebContents* OpenURL( | 402 virtual content::WebContents* OpenURL( |
| 403 const content::OpenURLParams& params) OVERRIDE; | 403 const content::OpenURLParams& params) OVERRIDE; |
| 404 | 404 |
| 405 // Overridden from TabStripModelObserver: | 405 // Overridden from TabStripModelObserver: |
| 406 virtual void TabInsertedAt(content::WebContents* contents, | 406 virtual void TabInsertedAt(content::WebContents* contents, |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 | 958 |
| 959 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 959 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 960 | 960 |
| 961 // The following factory is used to close the frame at a later time. | 961 // The following factory is used to close the frame at a later time. |
| 962 base::WeakPtrFactory<Browser> weak_factory_; | 962 base::WeakPtrFactory<Browser> weak_factory_; |
| 963 | 963 |
| 964 DISALLOW_COPY_AND_ASSIGN(Browser); | 964 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 965 }; | 965 }; |
| 966 | 966 |
| 967 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 967 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |