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

Unified Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

Issue 10020048: Work on USE_ASH/USE_AURA split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
similarity index 82%
rename from chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
rename to chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
index ca32443d82a01337cb4c613dda85261868e77b7b..b2d0bd82a825719d25030a7a7c69172a1f064924 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
+#define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
#pragma once
#include "base/memory/scoped_ptr.h"
@@ -18,12 +18,12 @@ namespace views {
class ImageButton;
}
-class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,
- public views::ButtonListener,
- public TabIconView::TabIconViewModel {
+class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
+ public views::ButtonListener,
+ public TabIconView::TabIconViewModel {
public:
- BrowserNonClientFrameViewAura(BrowserFrame* frame, BrowserView* browser_view);
- virtual ~BrowserNonClientFrameViewAura();
+ BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
+ virtual ~BrowserNonClientFrameViewAsh();
void Init();
@@ -92,7 +92,7 @@ class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,
// maximized and restored.
bool size_button_minimizes_;
- DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
+ DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
};
-#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
+#endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_

Powered by Google App Engine
This is Rietveld 408576698