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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shell_observer.h" 10 #include "ash/common/shell_observer.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
14 #include "chrome/browser/ui/views/tab_icon_view_model.h" 14 #include "chrome/browser/ui/views/tab_icon_view_model.h"
15 15
16 class TabIconView; 16 class TabIconView;
17 17
18 namespace ash { 18 namespace ash {
19 class FrameCaptionButtonContainerView; 19 class FrameCaptionButtonContainerView;
20 class HeaderPainter; 20 class HeaderPainter;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // For popups, the window icon. 106 // For popups, the window icon.
107 TabIconView* window_icon_; 107 TabIconView* window_icon_;
108 108
109 // Helper class for painting the header. 109 // Helper class for painting the header.
110 std::unique_ptr<ash::HeaderPainter> header_painter_; 110 std::unique_ptr<ash::HeaderPainter> header_painter_;
111 111
112 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 112 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
113 }; 113 };
114 114
115 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 115 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698