...Maybe I should start off like this:
from http://www.kpsec.freeuk.com/powersup.htm
In a desktop, all of those components are inside the PSU.
However in a laptop wouldn't the smoothing and regulating portion be inside the laptop so as to control input from the battery also (when its running on battery power only)?
Yes, you are correct.
AC Power Adapter would be the correct terminology.
Your block diagram does not apply to Switched-mode power supply:
http://en.wikipedia.org/wiki/Switched-mode_power_supplyThe AC Power Adapter is sometimes referred to by other names, so you have to figure out what is being referred to.
Laptops don't have a PSU, which is generally the terminology given to the Power Supply Unit in a desktop only.
Computer PSU's are switchers.
Interior view of an ATX SMPS: below
A: input EMI filtering; A: bridge rectifier;
B: input filter capacitors;
Between B and C: primary side heat sink;
C: transformer;
Between C and D: secondary side heat sink;
D: output filter coil;
E: output filter capacitors.
The coil and large yellow capacitor below E are additional input filtering components that are mounted directly on the power input connector and are not part of the main circuit board.