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

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

Issue 11828026: Remove DeviceAttachedIntentSource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/intents/device_attached_intent_source.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "content/public/common/page_zoom.h" 44 #include "content/public/common/page_zoom.h"
45 #include "ui/base/dialogs/select_file_dialog.h" 45 #include "ui/base/dialogs/select_file_dialog.h"
46 #include "ui/base/ui_base_types.h" 46 #include "ui/base/ui_base_types.h"
47 #include "ui/gfx/rect.h" 47 #include "ui/gfx/rect.h"
48 48
49 class BrowserContentSettingBubbleModelDelegate; 49 class BrowserContentSettingBubbleModelDelegate;
50 class BrowserSyncedWindowDelegate; 50 class BrowserSyncedWindowDelegate;
51 class BrowserToolbarModelDelegate; 51 class BrowserToolbarModelDelegate;
52 class BrowserTabRestoreServiceDelegate; 52 class BrowserTabRestoreServiceDelegate;
53 class BrowserWindow; 53 class BrowserWindow;
54 class DeviceAttachedIntentSource;
55 class FindBarController; 54 class FindBarController;
56 class FullscreenController; 55 class FullscreenController;
57 class PrefService; 56 class PrefService;
58 class Profile; 57 class Profile;
59 class StatusBubble; 58 class StatusBubble;
60 class TabNavigation; 59 class TabNavigation;
61 class TabStripModel; 60 class TabStripModel;
62 class TabStripModelDelegate; 61 class TabStripModelDelegate;
63 struct WebApplicationInfo; 62 struct WebApplicationInfo;
64 63
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 // Helper which implements the TabRestoreServiceDelegate interface. 923 // Helper which implements the TabRestoreServiceDelegate interface.
925 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; 924 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
926 925
927 // Helper which implements the SyncedWindowDelegate interface. 926 // Helper which implements the SyncedWindowDelegate interface.
928 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; 927 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
929 928
930 scoped_ptr<chrome::BrowserInstantController> instant_controller_; 929 scoped_ptr<chrome::BrowserInstantController> instant_controller_;
931 930
932 BookmarkBar::State bookmark_bar_state_; 931 BookmarkBar::State bookmark_bar_state_;
933 932
934 #if 0
935 // Device attach web intent is disabled for M22. See crbug.com/144326.
936 scoped_ptr<DeviceAttachedIntentSource> device_attached_intent_source_;
937 #endif
938
939 scoped_ptr<FullscreenController> fullscreen_controller_; 933 scoped_ptr<FullscreenController> fullscreen_controller_;
940 934
941 scoped_ptr<extensions::WindowController> extension_window_controller_; 935 scoped_ptr<extensions::WindowController> extension_window_controller_;
942 936
943 scoped_ptr<chrome::BrowserCommandController> command_controller_; 937 scoped_ptr<chrome::BrowserCommandController> command_controller_;
944 938
945 // True if the browser window has been shown at least once. 939 // True if the browser window has been shown at least once.
946 bool window_has_shown_; 940 bool window_has_shown_;
947 941
948 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 942 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
949 // before DidEndColorChooser is called. 943 // before DidEndColorChooser is called.
950 scoped_ptr<content::ColorChooser> color_chooser_; 944 scoped_ptr<content::ColorChooser> color_chooser_;
951 945
952 DISALLOW_COPY_AND_ASSIGN(Browser); 946 DISALLOW_COPY_AND_ASSIGN(Browser);
953 }; 947 };
954 948
955 #endif // CHROME_BROWSER_UI_BROWSER_H_ 949 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/intents/device_attached_intent_source.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698