Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 2254273003: Remove text encoding UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" 28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
30 #include "chrome/browser/ui/profile_chooser_constants.h" 30 #include "chrome/browser/ui/profile_chooser_constants.h"
31 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" 31 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
32 #include "chrome/browser/ui/signin_view_controller.h" 32 #include "chrome/browser/ui/signin_view_controller.h"
33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
35 #include "components/content_settings/core/common/content_settings.h" 35 #include "components/content_settings/core/common/content_settings.h"
36 #include "components/content_settings/core/common/content_settings_types.h" 36 #include "components/content_settings/core/common/content_settings_types.h"
37 #include "components/prefs/pref_change_registrar.h" 37 #include "components/prefs/pref_change_registrar.h"
38 #include "components/prefs/pref_member.h" 38 #include "components/prefs/pref_member.h"
msw 2016/08/23 18:06:27 nit: maybe not needed?
Jinsuk Kim 2016/08/23 22:46:13 Done.
39 #include "components/sessions/core/session_id.h" 39 #include "components/sessions/core/session_id.h"
40 #include "components/toolbar/toolbar_model.h" 40 #include "components/toolbar/toolbar_model.h"
41 #include "components/translate/content/browser/content_translate_driver.h" 41 #include "components/translate/content/browser/content_translate_driver.h"
42 #include "components/zoom/zoom_observer.h" 42 #include "components/zoom/zoom_observer.h"
43 #include "content/public/browser/notification_observer.h" 43 #include "content/public/browser/notification_observer.h"
44 #include "content/public/browser/notification_registrar.h" 44 #include "content/public/browser/notification_registrar.h"
45 #include "content/public/browser/page_navigator.h" 45 #include "content/public/browser/page_navigator.h"
46 #include "content/public/browser/web_contents_delegate.h" 46 #include "content/public/browser/web_contents_delegate.h"
47 #include "content/public/common/page_zoom.h" 47 #include "content/public/common/page_zoom.h"
48 #include "ui/base/page_transition_types.h" 48 #include "ui/base/page_transition_types.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 // this varies during the lifetime of the browser. For example, if the window 380 // this varies during the lifetime of the browser. For example, if the window
381 // is fullscreen this may return a different value. If you only care about 381 // is fullscreen this may return a different value. If you only care about
382 // whether or not it's possible for the browser to support a particular 382 // whether or not it's possible for the browser to support a particular
383 // feature use |CanSupportWindowFeature|. 383 // feature use |CanSupportWindowFeature|.
384 bool SupportsWindowFeature(WindowFeature feature) const; 384 bool SupportsWindowFeature(WindowFeature feature) const;
385 385
386 // Returns true if the Browser can support the specified feature. See comment 386 // Returns true if the Browser can support the specified feature. See comment
387 // in |SupportsWindowFeature| for details on this. 387 // in |SupportsWindowFeature| for details on this.
388 bool CanSupportWindowFeature(WindowFeature feature) const; 388 bool CanSupportWindowFeature(WindowFeature feature) const;
389 389
390 // TODO(port): port these, and re-merge the two function declaration lists.
391 // Page-related commands.
392 void ToggleEncodingAutoDetect();
393 void OverrideEncoding(int encoding_id);
394
395 // Show various bits of UI 390 // Show various bits of UI
396 void OpenFile(); 391 void OpenFile();
397 392
398 void UpdateDownloadShelfVisibility(bool visible); 393 void UpdateDownloadShelfVisibility(bool visible);
399 394
400 ///////////////////////////////////////////////////////////////////////////// 395 /////////////////////////////////////////////////////////////////////////////
401 396
402 // Called by chrome::Navigate() when a navigation has occurred in a tab in 397 // Called by chrome::Navigate() when a navigation has occurred in a tab in
403 // this Browser. Updates the UI for the start of this navigation. 398 // this Browser. Updates the UI for the start of this navigation.
404 void UpdateUIForNavigationInTab(content::WebContents* contents, 399 void UpdateUIForNavigationInTab(content::WebContents* contents,
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 951
957 std::unique_ptr<ChromeBubbleManager> bubble_manager_; 952 std::unique_ptr<ChromeBubbleManager> bubble_manager_;
958 953
959 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 954 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
960 // non-NULL, it may or may not be visible. 955 // non-NULL, it may or may not be visible.
961 std::unique_ptr<FindBarController> find_bar_controller_; 956 std::unique_ptr<FindBarController> find_bar_controller_;
962 957
963 // Dialog box used for opening and saving files. 958 // Dialog box used for opening and saving files.
964 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 959 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
965 960
966 // Keep track of the encoding auto detect pref.
967 BooleanPrefMember encoding_auto_detect_;
968
969 // Helper which implements the ContentSettingBubbleModel interface. 961 // Helper which implements the ContentSettingBubbleModel interface.
970 std::unique_ptr<BrowserContentSettingBubbleModelDelegate> 962 std::unique_ptr<BrowserContentSettingBubbleModelDelegate>
971 content_setting_bubble_model_delegate_; 963 content_setting_bubble_model_delegate_;
972 964
973 // Helper which implements the ToolbarModelDelegate interface. 965 // Helper which implements the ToolbarModelDelegate interface.
974 std::unique_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_; 966 std::unique_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_;
975 967
976 // A delegate that handles the details of updating the "active" 968 // A delegate that handles the details of updating the "active"
977 // |search_model_| state with the tab's state. 969 // |search_model_| state with the tab's state.
978 std::unique_ptr<SearchDelegate> search_delegate_; 970 std::unique_ptr<SearchDelegate> search_delegate_;
(...skipping 30 matching lines...) Expand all
1009 // The following factory is used for chrome update coalescing. 1001 // The following factory is used for chrome update coalescing.
1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1002 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1011 1003
1012 // The following factory is used to close the frame at a later time. 1004 // The following factory is used to close the frame at a later time.
1013 base::WeakPtrFactory<Browser> weak_factory_; 1005 base::WeakPtrFactory<Browser> weak_factory_;
1014 1006
1015 DISALLOW_COPY_AND_ASSIGN(Browser); 1007 DISALLOW_COPY_AND_ASSIGN(Browser);
1016 }; 1008 };
1017 1009
1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1010 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698