chrome/browser/remoting/setup_flow.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

Side by Side Diff: chrome/browser/remoting/setup_flow.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

« no previous file with comments | « chrome/browser/process_singleton.h ('k') | chrome/browser/renderer_host/accelerated_surface_container_mac.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/remoting/setup_flow.h"	5 #include "chrome/browser/remoting/setup_flow.h"

6	6

7 #include "base/json/json_reader.h"	7 #include "base/json/json_reader.h"

8 #include "base/json/json_writer.h"	8 #include "base/json/json_writer.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "chrome/browser/browser_thread.h"	11 #include "chrome/browser/browser_thread.h"

12 #include "chrome/browser/prefs/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/remoting/remoting_resources_source.h"	14 #include "chrome/browser/remoting/remoting_resources_source.h"

15 #include "chrome/browser/remoting/setup_flow_login_step.h"	15 #include "chrome/browser/remoting/setup_flow_login_step.h"

16 #include "chrome/browser/renderer_host/render_view_host.h"	16 #include "chrome/browser/renderer_host/render_view_host.h"

17 #include "chrome/browser/tab_contents/tab_contents.h"	17 #include "chrome/browser/tab_contents/tab_contents.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_list.h"	19 #include "chrome/browser/ui/browser_list.h"

20 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

21 #include "gfx/font.h"

22 #include "grit/generated_resources.h"	21 #include "grit/generated_resources.h"

23 #include "grit/locale_settings.h"	22 #include "grit/locale_settings.h"

24 #include "ui/base/l10n/l10n_font_util.h"	23 #include "ui/base/l10n/l10n_font_util.h"

25 #include "ui/base/l10n/l10n_util.h"	24 #include "ui/base/l10n/l10n_util.h"

	25 #include "ui/gfx/font.h"

26	26

27 namespace remoting {	27 namespace remoting {

28	28

29 static const wchar_t kDoneIframeXPath[] = L"//iframe[@id='done']";	29 static const wchar_t kDoneIframeXPath[] = L"//iframe[@id='done']";

30 static const wchar_t kErrorIframeXPath[] = L"//iframe[@id='error']";	30 static const wchar_t kErrorIframeXPath[] = L"//iframe[@id='error']";

31	31

32 SetupFlowStep::SetupFlowStep() { }	32 SetupFlowStep::SetupFlowStep() { }

33 SetupFlowStep::~SetupFlowStep() { }	33 SetupFlowStep::~SetupFlowStep() { }

34	34

35 SetupFlowStepBase::SetupFlowStepBase()	35 SetupFlowStepBase::SetupFlowStepBase()

(...skipping 223 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
259 BrowserThread::PostTask(	259 BrowserThread::PostTask(

260 BrowserThread::UI, FROM_HERE,	260 BrowserThread::UI, FROM_HERE,

261 new DeleteTask<SetupFlowStep>(current_step_.release()));	261 new DeleteTask<SetupFlowStep>(current_step_.release()));

262 }	262 }

263	263

264 current_step_.reset(next_step);	264 current_step_.reset(next_step);

265 StartCurrentStep();	265 StartCurrentStep();

266 }	266 }

267	267

268 } // namespace remoting	268 } // namespace remoting

OLD	NEW