chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc - Issue 10823245: ash: Copy launcher files from views/ to ash/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10823245: ash: Copy launcher files from views/ to ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/views/ash/launcher/browser_launcher_item_controller. h"	5 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"

6	6

7 #include "ash/launcher/launcher.h"	7 #include "ash/launcher/launcher.h"

8 #include "ash/launcher/launcher_model.h"	8 #include "ash/launcher/launcher_model.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/wm/window_util.h"	10 #include "ash/wm/window_util.h"

(...skipping 239 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250 app_state = ChromeLauncherController::APP_STATE_ACTIVE;	250 app_state = ChromeLauncherController::APP_STATE_ACTIVE;

251 } else {	251 } else {

252 app_state = ChromeLauncherController::APP_STATE_INACTIVE;	252 app_state = ChromeLauncherController::APP_STATE_INACTIVE;

253 }	253 }

254 launcher_controller_->UpdateAppState(tab, app_state);	254 launcher_controller_->UpdateAppState(tab, app_state);

255 }	255 }

256	256

257 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {	257 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {

258 return launcher_controller_->model();	258 return launcher_controller_->model();

259 }	259 }

OLD	NEW