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

Side by Side Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "chrome/browser/ui/extensions/application_launch.h" 5 #include "chrome/browser/ui/extensions/application_launch.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "apps/launcher.h" 9 #include "apps/launcher.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 84
85 private: 85 private:
86 gfx::NativeWindow ShowAppList() { 86 gfx::NativeWindow ShowAppList() {
87 AppListService* app_list_service = AppListService::Get(desktop_type_); 87 AppListService* app_list_service = AppListService::Get(desktop_type_);
88 app_list_service->Show(); 88 app_list_service->Show();
89 return app_list_service->GetAppListWindow(); 89 return app_list_service->GetAppListWindow();
90 } 90 }
91 91
92 // ExtensionEnableFlowDelegate overrides. 92 // ExtensionEnableFlowDelegate overrides.
93 virtual void ExtensionEnableFlowFinished() OVERRIDE { 93 virtual void ExtensionEnableFlowFinished() override {
94 const Extension* extension = 94 const Extension* extension =
95 service_->GetExtensionById(extension_id_, false); 95 service_->GetExtensionById(extension_id_, false);
96 if (!extension) 96 if (!extension)
97 return; 97 return;
98 callback_.Run(); 98 callback_.Run();
99 delete this; 99 delete this;
100 } 100 }
101 101
102 virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE { 102 virtual void ExtensionEnableFlowAborted(bool user_initiated) override {
103 delete this; 103 delete this;
104 } 104 }
105 105
106 ExtensionService* service_; 106 ExtensionService* service_;
107 Profile* profile_; 107 Profile* profile_;
108 chrome::HostDesktopType desktop_type_; 108 chrome::HostDesktopType desktop_type_;
109 std::string extension_id_; 109 std::string extension_id_;
110 base::Closure callback_; 110 base::Closure callback_;
111 scoped_ptr<ExtensionEnableFlow> flow_; 111 scoped_ptr<ExtensionEnableFlow> flow_;
112 112
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 456
457 // For extensions lacking launch urls, determine a reasonable fallback. 457 // For extensions lacking launch urls, determine a reasonable fallback.
458 if (!url.is_valid()) { 458 if (!url.is_valid()) {
459 url = extensions::OptionsPageInfo::GetOptionsPage(extension); 459 url = extensions::OptionsPageInfo::GetOptionsPage(extension);
460 if (!url.is_valid()) 460 if (!url.is_valid())
461 url = GURL(chrome::kChromeUIExtensionsURL); 461 url = GURL(chrome::kChromeUIExtensionsURL);
462 } 462 }
463 463
464 return url; 464 return url;
465 } 465 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/crypto_module_delegate_nss.h ('k') | chrome/browser/ui/extensions/extension_enable_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698