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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_handler.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 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 "chrome/browser/ui/webui/options2/certificate_manager_handler.h" 5 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/file_util.h" // for FileAccessProvider 12 #include "base/file_util.h" // for FileAccessProvider
13 #include "base/id_map.h" 13 #include "base/id_map.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "base/safe_strerror_posix.h" 15 #include "base/safe_strerror_posix.h"
(...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1085 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1086 ready); 1086 ready);
1087 } 1087 }
1088 #endif 1088 #endif
1089 1089
1090 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1090 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1091 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1091 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1092 } 1092 }
1093 1093
1094 } // namespace options 1094 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698