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

Side by Side Diff: components/app_modal/javascript_dialog_manager.cc

Issue 2712513004: Use a qualified path for grit-generated headers in components/ (Closed)
Patch Set: more checkdeps Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/app_modal/javascript_dialog_manager.h" 5 #include "components/app_modal/javascript_dialog_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "components/app_modal/app_modal_dialog.h" 15 #include "components/app_modal/app_modal_dialog.h"
16 #include "components/app_modal/app_modal_dialog_queue.h" 16 #include "components/app_modal/app_modal_dialog_queue.h"
17 #include "components/app_modal/javascript_dialog_extensions_client.h" 17 #include "components/app_modal/javascript_dialog_extensions_client.h"
18 #include "components/app_modal/javascript_native_dialog_factory.h" 18 #include "components/app_modal/javascript_native_dialog_factory.h"
19 #include "components/app_modal/native_app_modal_dialog.h" 19 #include "components/app_modal/native_app_modal_dialog.h"
20 #include "components/strings/grit/components_strings.h"
20 #include "components/url_formatter/elide_url.h" 21 #include "components/url_formatter/elide_url.h"
21 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
22 #include "content/public/common/javascript_dialog_type.h" 23 #include "content/public/common/javascript_dialog_type.h"
23 #include "grit/components_strings.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/gfx/font_list.h" 25 #include "ui/gfx/font_list.h"
26 26
27 namespace app_modal { 27 namespace app_modal {
28 28
29 namespace { 29 namespace {
30 30
31 #if !defined(OS_ANDROID) 31 #if !defined(OS_ANDROID)
32 // Keep in sync with kDefaultMessageWidth, but allow some space for the rest of 32 // Keep in sync with kDefaultMessageWidth, but allow some space for the rest of
33 // the text. 33 // the text.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 // lazy background page after the dialog closes. (Dialogs are closed before 307 // lazy background page after the dialog closes. (Dialogs are closed before
308 // their WebContents is destroyed so |web_contents| is still valid here.) 308 // their WebContents is destroyed so |web_contents| is still valid here.)
309 extensions_client_->OnDialogClosed(web_contents); 309 extensions_client_->OnDialogClosed(web_contents);
310 310
311 last_close_time_ = base::TimeTicks::Now(); 311 last_close_time_ = base::TimeTicks::Now();
312 312
313 callback.Run(success, user_input); 313 callback.Run(success, user_input);
314 } 314 }
315 315
316 } // namespace app_modal 316 } // namespace app_modal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698