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

Side by Side Diff: trunk/src/chrome/browser/translate/options_menu_model.cc

Issue 102163002: Revert 238283 "Infobar system refactor." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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/translate/options_menu_model.h" 5 #include "chrome/browser/translate/options_menu_model.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/translate/translate_infobar_delegate.h" 10 #include "chrome/browser/translate/translate_infobar_delegate.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "content/public/browser/navigation_controller.h" 12 #include "content/public/browser/navigation_controller.h"
13 #include "content/public/browser/navigation_entry.h" 13 #include "content/public/browser/navigation_entry.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "grit/locale_settings.h" 16 #include "grit/locale_settings.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 18
19 using content::NavigationEntry; 19 using content::NavigationEntry;
20 using content::OpenURLParams; 20 using content::OpenURLParams;
21 using content::Referrer; 21 using content::Referrer;
22 using content::WebContents; 22 using content::WebContents;
23 23
24 OptionsMenuModel::OptionsMenuModel( 24 OptionsMenuModel::OptionsMenuModel(
25 TranslateInfoBarDelegate* translate_delegate) 25 TranslateInfoBarDelegate* translate_delegate)
26 : ui::SimpleMenuModel(this), 26 : ui::SimpleMenuModel(this),
27 translate_infobar_delegate_(translate_delegate) { 27 translate_infobar_delegate_(translate_delegate) {
28 // |translate_delegate| must already be owned.
29 DCHECK(translate_infobar_delegate_->web_contents());
30
31 string16 original_language = translate_delegate->language_name_at( 28 string16 original_language = translate_delegate->language_name_at(
32 translate_delegate->original_language_index()); 29 translate_delegate->original_language_index());
33 string16 target_language = translate_delegate->language_name_at( 30 string16 target_language = translate_delegate->language_name_at(
34 translate_delegate->target_language_index()); 31 translate_delegate->target_language_index());
35 32
36 bool autodetermined_source_language = 33 bool autodetermined_source_language =
37 translate_delegate->original_language_index() == 34 translate_delegate->original_language_index() ==
38 TranslateInfoBarDelegate::kNoIndex; 35 TranslateInfoBarDelegate::kNoIndex;
39 36
40 // Populate the menu. 37 // Populate the menu.
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 web_contents->OpenURL(params); 130 web_contents->OpenURL(params);
134 } 131 }
135 break; 132 break;
136 } 133 }
137 134
138 default: 135 default:
139 NOTREACHED() << "Invalid command id from menu."; 136 NOTREACHED() << "Invalid command id from menu.";
140 break; 137 break;
141 } 138 }
142 } 139 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/three_d_api_observer.cc ('k') | trunk/src/chrome/browser/translate/translate_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698