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

Side by Side Diff: trunk/src/chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 296003014: Revert 272217 "LanguageState should be owned by TranslateManager" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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/cocoa/browser_window_cocoa.h" 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/ui/cocoa/task_manager_mac.h" 43 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
45 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" 45 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
46 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h" 46 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
47 #include "chrome/browser/ui/search/search_model.h" 47 #include "chrome/browser/ui/search/search_model.h"
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" 48 #include "chrome/browser/ui/tabs/tab_strip_model.h"
49 #include "chrome/browser/web_applications/web_app.h" 49 #include "chrome/browser/web_applications/web_app.h"
50 #include "chrome/common/chrome_switches.h" 50 #include "chrome/common/chrome_switches.h"
51 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
52 #include "components/autofill/core/common/password_form.h" 52 #include "components/autofill/core/common/password_form.h"
53 #include "components/translate/core/browser/language_state.h"
54 #include "content/public/browser/native_web_keyboard_event.h" 53 #include "content/public/browser/native_web_keyboard_event.h"
55 #include "content/public/browser/notification_details.h" 54 #include "content/public/browser/notification_details.h"
56 #include "content/public/browser/notification_source.h" 55 #include "content/public/browser/notification_source.h"
57 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
58 #include "grit/chromium_strings.h" 57 #include "grit/chromium_strings.h"
59 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
60 #include "ui/base/l10n/l10n_util_mac.h" 59 #include "ui/base/l10n/l10n_util_mac.h"
61 #include "ui/gfx/rect.h" 60 #include "ui/gfx/rect.h"
62 61
63 #if defined(ENABLE_ONE_CLICK_SIGNIN) 62 #if defined(ENABLE_ONE_CLICK_SIGNIN)
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 750
752 void BrowserWindowCocoa::ShowPageActionPopup( 751 void BrowserWindowCocoa::ShowPageActionPopup(
753 const extensions::Extension* extension) { 752 const extensions::Extension* extension) {
754 [cocoa_controller() activatePageAction:extension->id()]; 753 [cocoa_controller() activatePageAction:extension->id()];
755 } 754 }
756 755
757 void BrowserWindowCocoa::ShowBrowserActionPopup( 756 void BrowserWindowCocoa::ShowBrowserActionPopup(
758 const extensions::Extension* extension) { 757 const extensions::Extension* extension) {
759 [cocoa_controller() activateBrowserAction:extension->id()]; 758 [cocoa_controller() activateBrowserAction:extension->id()];
760 } 759 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/browser_commands.cc ('k') | trunk/src/chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698