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

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

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 (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 "components/app_modal/javascript_app_modal_dialog.h" 5 #include "components/app_modal/javascript_app_modal_dialog.h"
6 6
7 #include "build/build_config.h"
7 #include "components/app_modal/javascript_dialog_manager.h" 8 #include "components/app_modal/javascript_dialog_manager.h"
8 #include "components/app_modal/javascript_native_dialog_factory.h" 9 #include "components/app_modal/javascript_native_dialog_factory.h"
9 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
10 #include "ui/gfx/text_elider.h" 11 #include "ui/gfx/text_elider.h"
11 #include "url/origin.h" 12 #include "url/origin.h"
12 13
13 namespace app_modal { 14 namespace app_modal {
14 namespace { 15 namespace {
15 16
16 // Control maximum sizes of various texts passed to us from javascript. 17 // Control maximum sizes of various texts passed to us from javascript.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 164
164 // static 165 // static
165 std::string JavaScriptAppModalDialog::GetSerializedOriginForWebContents( 166 std::string JavaScriptAppModalDialog::GetSerializedOriginForWebContents(
166 content::WebContents* contents) { 167 content::WebContents* contents) {
167 if (!contents) 168 if (!contents)
168 return url::Origin().Serialize(); 169 return url::Origin().Serialize();
169 return url::Origin(contents->GetLastCommittedURL()).Serialize(); 170 return url::Origin(contents->GetLastCommittedURL()).Serialize();
170 } 171 }
171 172
172 } // namespace app_modal 173 } // namespace app_modal
OLDNEW
« no previous file with comments | « components/app_modal/javascript_app_modal_dialog.h ('k') | components/app_modal/javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698