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

Side by Side Diff: ui/views/examples/examples_window_with_content.cc

Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/views/test/desktop_test_views_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/views/examples/examples_window_with_content.h" 5 #include "ui/views/examples/examples_window_with_content.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 28 matching lines...) Expand all
39 #include "ui/views/examples/tree_view_example.h" 39 #include "ui/views/examples/tree_view_example.h"
40 #include "ui/views/examples/webview_example.h" 40 #include "ui/views/examples/webview_example.h"
41 #include "ui/views/examples/widget_example.h" 41 #include "ui/views/examples/widget_example.h"
42 #include "ui/views/focus/accelerator_handler.h" 42 #include "ui/views/focus/accelerator_handler.h"
43 #include "ui/views/layout/fill_layout.h" 43 #include "ui/views/layout/fill_layout.h"
44 #include "ui/views/layout/grid_layout.h" 44 #include "ui/views/layout/grid_layout.h"
45 #include "ui/views/widget/widget.h" 45 #include "ui/views/widget/widget.h"
46 #include "ui/views/widget/widget_delegate.h" 46 #include "ui/views/widget/widget_delegate.h"
47 47
48 #if defined(USE_AURA) 48 #if defined(USE_AURA)
49 #include "ui/views/widget/desktop_native_widget_aura.h" 49 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
50 #endif 50 #endif
51 51
52 namespace views { 52 namespace views {
53 namespace examples { 53 namespace examples {
54 54
55 // Model for the examples that are being added via AddExample(). 55 // Model for the examples that are being added via AddExample().
56 class ComboboxModelExampleList : public ui::ComboboxModel { 56 class ComboboxModelExampleList : public ui::ComboboxModel {
57 public: 57 public:
58 ComboboxModelExampleList() {} 58 ComboboxModelExampleList() {}
59 virtual ~ComboboxModelExampleList() {} 59 virtual ~ComboboxModelExampleList() {}
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 widget->Show(); 217 widget->Show();
218 } 218 }
219 } 219 }
220 220
221 void LogStatus(const std::string& string) { 221 void LogStatus(const std::string& string) {
222 ExamplesWindowContents::instance()->SetStatus(string); 222 ExamplesWindowContents::instance()->SetStatus(string);
223 } 223 }
224 224
225 } // namespace examples 225 } // namespace examples
226 } // namespace views 226 } // namespace views
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/views/test/desktop_test_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698