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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc

Issue 22887015: Remove PerBrowser launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit Created 7 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
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/ash/launcher/chrome_launcher_app_menu_item_tab.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
6 6
7 #include "ash/wm/window_util.h" 7 #include "ash/wm/window_util.h"
8 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
9 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
11 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "ui/base/events/event_constants.h"
13 13
14 ChromeLauncherAppMenuItemTab::ChromeLauncherAppMenuItemTab( 14 ChromeLauncherAppMenuItemTab::ChromeLauncherAppMenuItemTab(
15 const string16 title, 15 const string16 title,
16 const gfx::Image* icon, 16 const gfx::Image* icon,
17 content::WebContents* content, 17 content::WebContents* content,
18 bool has_leading_separator) 18 bool has_leading_separator)
19 : ChromeLauncherAppMenuItem(title, icon, has_leading_separator), 19 : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
20 content::WebContentsObserver(content) { 20 content::WebContentsObserver(content) {
21 } 21 }
22 22
(...skipping 20 matching lines...) Expand all
43 if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) { 43 if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) {
44 tab_strip->CloseWebContentsAt(index, TabStripModel::CLOSE_USER_GESTURE); 44 tab_strip->CloseWebContentsAt(index, TabStripModel::CLOSE_USER_GESTURE);
45 } else { 45 } else {
46 tab_strip->ActivateTabAt(index, false); 46 tab_strip->ActivateTabAt(index, false);
47 browser->window()->Show(); 47 browser->window()->Show();
48 // Need this check to prevent unit tests from crashing. 48 // Need this check to prevent unit tests from crashing.
49 if (browser->window()->GetNativeWindow()) 49 if (browser->window()->GetNativeWindow())
50 ash::wm::ActivateWindow(browser->window()->GetNativeWindow()); 50 ash::wm::ActivateWindow(browser->window()->GetNativeWindow());
51 } 51 }
52 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698