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

Side by Side Diff: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/views/sync/profile_signin_confirmation_dialog_views. h" 5 #include "chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views. h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_navigator.h" 11 #include "chrome/browser/ui/browser_navigator.h"
12 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
13 #include "chrome/browser/ui/host_desktop.h"
14 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" 13 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
15 #include "chrome/grit/chromium_strings.h" 14 #include "chrome/grit/chromium_strings.h"
16 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
17 #include "components/constrained_window/constrained_window_views.h" 16 #include "components/constrained_window/constrained_window_views.h"
18 #include "components/signin/core/common/profile_management_switches.h" 17 #include "components/signin/core/common/profile_management_switches.h"
19 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
20 #include "google_apis/gaia/gaia_auth_util.h" 19 #include "google_apis/gaia/gaia_auth_util.h"
21 #include "third_party/skia/include/core/SkColor.h" 20 #include "third_party/skia/include/core/SkColor.h"
22 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/gfx/font.h" 22 #include "ui/gfx/font.h"
23 #include "ui/gfx/host_desktop_type.h"
24 #include "ui/gfx/native_widget_types.h" 24 #include "ui/gfx/native_widget_types.h"
25 #include "ui/gfx/range/range.h" 25 #include "ui/gfx/range/range.h"
26 #include "ui/views/background.h" 26 #include "ui/views/background.h"
27 #include "ui/views/border.h" 27 #include "ui/views/border.h"
28 #include "ui/views/controls/label.h" 28 #include "ui/views/controls/label.h"
29 #include "ui/views/controls/styled_label.h" 29 #include "ui/views/controls/styled_label.h"
30 #include "ui/views/layout/box_layout.h" 30 #include "ui/views/layout/box_layout.h"
31 #include "ui/views/layout/grid_layout.h" 31 #include "ui/views/layout/grid_layout.h"
32 #include "ui/views/layout/layout_constants.h" 32 #include "ui/views/layout/layout_constants.h"
33 #include "ui/views/widget/widget.h" 33 #include "ui/views/widget/widget.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 views::Button* sender, 247 views::Button* sender,
248 const ui::Event& event) { 248 const ui::Event& event) {
249 DCHECK(prompt_for_new_profile_); 249 DCHECK(prompt_for_new_profile_);
250 DCHECK_EQ(continue_signin_button_, sender); 250 DCHECK_EQ(continue_signin_button_, sender);
251 if (delegate_) { 251 if (delegate_) {
252 delegate_->OnContinueSignin(); 252 delegate_->OnContinueSignin();
253 delegate_ = NULL; 253 delegate_ = NULL;
254 } 254 }
255 GetWidget()->Close(); 255 GetWidget()->Close();
256 } 256 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_extension.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698