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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/shell_delegate.h" 11 #include "ash/common/shell_delegate.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 class DisplayConfigurationObserver; 18 class DisplayConfigurationObserver;
19 } 19 }
20 20
21 namespace keyboard { 21 namespace keyboard {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 ChromeLauncherControllerImpl* shelf_delegate_; 73 ChromeLauncherControllerImpl* shelf_delegate_;
74 74
75 std::unique_ptr<chromeos::DisplayConfigurationObserver> 75 std::unique_ptr<chromeos::DisplayConfigurationObserver>
76 display_configuration_observer_; 76 display_configuration_observer_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 78 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
79 }; 79 };
80 80
81 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 81 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698