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

Side by Side Diff: chrome/browser/ui/views/ash/status_area_host_aura.h

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | Annotate | Revision Log
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_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_STATUS_AREA_HOST_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_STATUS_AREA_HOST_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/chromeos/status/status_area_button.h" 10 #include "chrome/browser/chromeos/status/status_area_button.h"
11 #include "chrome/browser/ui/browser_list.h" 11 #include "chrome/browser/ui/browser_list.h"
12 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
14 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_; 85 scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_;
86 86
87 scoped_ptr<ClockUpdater> clock_updater_; 87 scoped_ptr<ClockUpdater> clock_updater_;
88 #endif 88 #endif
89 89
90 content::NotificationRegistrar registrar_; 90 content::NotificationRegistrar registrar_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura); 92 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura);
93 }; 93 };
94 94
95 #endif // CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 95 #endif // CHROME_BROWSER_UI_VIEWS_ASH_STATUS_AREA_HOST_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/screenshot_taker.cc ('k') | chrome/browser/ui/views/ash/status_area_host_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698