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

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

Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 2 more cases Created 9 years, 10 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/file_select_helper.cc ('k') | chrome/browser/ui/cocoa/shell_dialogs_mac.mm » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
17 #include "base/scoped_ptr.h" 17 #include "base/scoped_ptr.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/task.h" 19 #include "base/task.h"
20 #include "chrome/browser/command_updater.h" 20 #include "chrome/browser/command_updater.h"
21 #include "chrome/browser/debugger/devtools_toggle_action.h" 21 #include "chrome/browser/debugger/devtools_toggle_action.h"
22 #include "chrome/browser/instant/instant_delegate.h" 22 #include "chrome/browser/instant/instant_delegate.h"
23 #include "chrome/browser/prefs/pref_member.h" 23 #include "chrome/browser/prefs/pref_member.h"
24 #include "chrome/browser/sessions/session_id.h" 24 #include "chrome/browser/sessions/session_id.h"
25 #include "chrome/browser/sessions/tab_restore_service_observer.h" 25 #include "chrome/browser/sessions/tab_restore_service_observer.h"
26 #include "chrome/browser/shell_dialogs.h"
27 #include "chrome/browser/sync/profile_sync_service_observer.h" 26 #include "chrome/browser/sync/profile_sync_service_observer.h"
28 #include "chrome/browser/tabs/tab_handler.h" 27 #include "chrome/browser/tabs/tab_handler.h"
29 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remov e 28 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remov e
30 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remov e 29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remov e
31 #include "chrome/browser/tab_contents/page_navigator.h" 30 #include "chrome/browser/tab_contents/page_navigator.h"
32 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 31 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
32 #include "chrome/browser/ui/shell_dialogs.h"
33 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" 33 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
34 #include "chrome/browser/ui/toolbar/toolbar_model.h" 34 #include "chrome/browser/ui/toolbar/toolbar_model.h"
35 #include "chrome/common/extensions/extension_constants.h" 35 #include "chrome/common/extensions/extension_constants.h"
36 #include "chrome/common/notification_registrar.h" 36 #include "chrome/common/notification_registrar.h"
37 #include "chrome/common/page_transition_types.h" 37 #include "chrome/common/page_transition_types.h"
38 #include "chrome/common/page_zoom.h" 38 #include "chrome/common/page_zoom.h"
39 #include "ui/gfx/rect.h" 39 #include "ui/gfx/rect.h"
40 40
41 class BrowserWindow; 41 class BrowserWindow;
42 class Extension; 42 class Extension;
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 // and we install ourselves as an observer. 1152 // and we install ourselves as an observer.
1153 TabRestoreService* tab_restore_service_; 1153 TabRestoreService* tab_restore_service_;
1154 1154
1155 scoped_ptr<InstantController> instant_; 1155 scoped_ptr<InstantController> instant_;
1156 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1156 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1157 1157
1158 DISALLOW_COPY_AND_ASSIGN(Browser); 1158 DISALLOW_COPY_AND_ASSIGN(Browser);
1159 }; 1159 };
1160 1160
1161 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1161 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/cocoa/shell_dialogs_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698