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

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

Issue 1361613002: Move all core files in //components/sessions into core/ subdir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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) 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_COCOA_HISTORY_MENU_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
6 #define CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_ 6 #define CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/mac/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/scoped_observer.h" 14 #include "base/scoped_observer.h"
15 #include "base/task/cancelable_task_tracker.h" 15 #include "base/task/cancelable_task_tracker.h"
16 #import "chrome/browser/ui/cocoa/main_menu_item.h" 16 #import "chrome/browser/ui/cocoa/main_menu_item.h"
17 #import "components/favicon/core/favicon_service.h" 17 #import "components/favicon/core/favicon_service.h"
18 #include "components/history/core/browser/history_service.h" 18 #include "components/history/core/browser/history_service.h"
19 #include "components/history/core/browser/history_service_observer.h" 19 #include "components/history/core/browser/history_service_observer.h"
20 #include "components/sessions/core/session_id.h"
20 #include "components/sessions/core/tab_restore_service.h" 21 #include "components/sessions/core/tab_restore_service.h"
21 #include "components/sessions/core/tab_restore_service_observer.h" 22 #include "components/sessions/core/tab_restore_service_observer.h"
22 #include "components/sessions/session_id.h"
23 23
24 class Profile; 24 class Profile;
25 @class HistoryMenuCocoaController; 25 @class HistoryMenuCocoaController;
26 26
27 namespace { 27 namespace {
28 class HistoryMenuBridgeTest; 28 class HistoryMenuBridgeTest;
29 } 29 }
30 30
31 namespace favicon_base { 31 namespace favicon_base {
32 struct FaviconImageResult; 32 struct FaviconImageResult;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // The default favicon if a HistoryItem does not have one. 237 // The default favicon if a HistoryItem does not have one.
238 base::scoped_nsobject<NSImage> default_favicon_; 238 base::scoped_nsobject<NSImage> default_favicon_;
239 239
240 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> 240 ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
241 history_service_observer_; 241 history_service_observer_;
242 242
243 DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge); 243 DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge);
244 }; 244 };
245 245
246 #endif // CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_ 246 #endif // CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/applescript/tab_applescript.mm ('k') | chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698