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

Side by Side Diff: ui/views/examples/content_client/examples_browser_main_parts.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 #include "ui/views/examples/content_client/examples_browser_main_parts.h" 5 #include "ui/views/examples/content_client/examples_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 23 matching lines...) Expand all
34 namespace examples { 34 namespace examples {
35 35
36 ExamplesBrowserMainParts::ExamplesBrowserMainParts( 36 ExamplesBrowserMainParts::ExamplesBrowserMainParts(
37 const content::MainFunctionParams& parameters) { 37 const content::MainFunctionParams& parameters) {
38 } 38 }
39 39
40 ExamplesBrowserMainParts::~ExamplesBrowserMainParts() { 40 ExamplesBrowserMainParts::~ExamplesBrowserMainParts() {
41 } 41 }
42 42
43 void ExamplesBrowserMainParts::ToolkitInitialized() { 43 void ExamplesBrowserMainParts::ToolkitInitialized() {
44 wm_state_.reset(new views::corewm::WMState); 44 wm_state_.reset(new wm::WMState);
45 } 45 }
46 46
47 void ExamplesBrowserMainParts::PreMainMessageLoopRun() { 47 void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
48 ui::InitializeInputMethodForTesting(); 48 ui::InitializeInputMethodForTesting();
49 browser_context_.reset(new content::ShellBrowserContext(false, NULL)); 49 browser_context_.reset(new content::ShellBrowserContext(false, NULL));
50 50
51 gfx::NativeView window_context = NULL; 51 gfx::NativeView window_context = NULL;
52 #if defined(OS_CHROMEOS) 52 #if defined(OS_CHROMEOS)
53 gfx::Screen::SetScreenInstance( 53 gfx::Screen::SetScreenInstance(
54 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create()); 54 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
(...skipping 24 matching lines...) Expand all
79 } 79 }
80 80
81 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) { 81 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) {
82 base::RunLoop run_loop; 82 base::RunLoop run_loop;
83 run_loop.Run(); 83 run_loop.Run();
84 return true; 84 return true;
85 } 85 }
86 86
87 } // namespace examples 87 } // namespace examples
88 } // namespace views 88 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/content_client/examples_browser_main_parts.h ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698