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

Side by Side Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 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 "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h" 5 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/callback_forward.h" 9 #include "base/callback_forward.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 25 matching lines...) Expand all
36 // Displays different options depending on the host OS. 36 // Displays different options depending on the host OS.
37 class LaunchOptionsComboboxModel : public ui::ComboboxModel { 37 class LaunchOptionsComboboxModel : public ui::ComboboxModel {
38 public: 38 public:
39 LaunchOptionsComboboxModel(); 39 LaunchOptionsComboboxModel();
40 virtual ~LaunchOptionsComboboxModel(); 40 virtual ~LaunchOptionsComboboxModel();
41 41
42 extensions::LaunchType GetLaunchTypeAtIndex(int index) const; 42 extensions::LaunchType GetLaunchTypeAtIndex(int index) const;
43 int GetIndexForLaunchType(extensions::LaunchType launch_type) const; 43 int GetIndexForLaunchType(extensions::LaunchType launch_type) const;
44 44
45 // Overridden from ui::ComboboxModel: 45 // Overridden from ui::ComboboxModel:
46 virtual int GetItemCount() const OVERRIDE; 46 virtual int GetItemCount() const override;
47 virtual base::string16 GetItemAt(int index) OVERRIDE; 47 virtual base::string16 GetItemAt(int index) override;
48 48
49 private: 49 private:
50 // A list of the launch types available in the combobox, in order. 50 // A list of the launch types available in the combobox, in order.
51 std::vector<extensions::LaunchType> launch_types_; 51 std::vector<extensions::LaunchType> launch_types_;
52 52
53 // A list of the messages to display in the combobox, in order. The indexes in 53 // A list of the messages to display in the combobox, in order. The indexes in
54 // this list correspond to the indexes in launch_types_. 54 // this list correspond to the indexes in launch_types_.
55 std::vector<base::string16> launch_type_messages_; 55 std::vector<base::string16> launch_type_messages_;
56 }; 56 };
57 57
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 DCHECK(CanSetLaunchType()); 351 DCHECK(CanSetLaunchType());
352 ExtensionService* service = 352 ExtensionService* service =
353 extensions::ExtensionSystem::Get(profile_)->extension_service(); 353 extensions::ExtensionSystem::Get(profile_)->extension_service();
354 extensions::SetLaunchType(service, app_->id(), launch_type); 354 extensions::SetLaunchType(service, app_->id(), launch_type);
355 } 355 }
356 356
357 bool AppInfoSummaryPanel::CanSetLaunchType() const { 357 bool AppInfoSummaryPanel::CanSetLaunchType() const {
358 // V2 apps don't have a launch type, and neither does the Chrome app. 358 // V2 apps don't have a launch type, and neither does the Chrome app.
359 return app_->id() != extension_misc::kChromeAppId && !app_->is_platform_app(); 359 return app_->id() != extension_misc::kChromeAppId && !app_->is_platform_app();
360 } 360 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698